Added better layout with cool icons