added subviews and fixed some things