Fix button command bug + change layout