Still working diligently

Some major UI and structure changes + other stuff