Improved layout/ css/ structure