Finished with logic, added subviews classes