Fixing code to look bether
rearenging buttons