Better graphics + Button alignment