Layout fixes, remove unnecessary re-layouting of content vc