Moved files around. Updated buttons