Layout renewed with few best practices