Heavy yo
Just more fixinz
Finished up for now
Merge branch 'feature/looknfeel' into develop