Moved things around in main activity