Move some things around for consistency
Move header bittons to action bar
add files