Clean up and added status bar

It is what it is