4/03/2014 Aaron

Updated some main components to fit into a generic screen.