New button style, editRound layouts are prettier

+some optimalizations and bug fixes