Fixed some bugs, removed some code. Made the view itself handling having to relayout the content.