Layout cleanup + small fixes (error pages)