Nemanja Bugs and layout fixed
Merge branch 'Nemanja'