Fixed layout-issues. But still not complete functional