Making it prettier, adding fuctionality.