Feature/cleanup layout