Nemanja Bugs and layout fixed