Fixed some little hacks and the view