Clean up

File clean up, Action bar adjustment