Started with some theme stuff and cleaned up ui