added more fuctionality, slightly different layout