Proposal/Detail: Improve Screen GUI

Proposal/Detail: Improve Screen GUI

Some buttons are organized slightly for better usage.