Second commit
Commit
Big changes in layout