Re-adding layout to include login logout and yield