quickfixing the layout, need to refactor really badly