Layout adjustments + Cleanup