fixing bugs
Merge pull request #35 from Adrian2014/layout/styling

fixing bugs