layout improvements + correct button enabling and click handling