[IMPROVEMENT] Better site layout