Feature/prefs layout