Added highlight state background to buttons; improved layout