Minor tweaks. Discovered bug in button alignment