Un-fucked layout scaling
Layout changes
Fixing merge errors