Re-worked almost all layouts