Moved all the frame stuff into main frame