add spaces
Restructure Buttons and Fixed UI