Some design fixes and changes
Added drawables
Merge branch 'LSSF' of https://github.com/lonehangman/Soshified into LSSF