Added in changes to try and get rid of subviews