improved layout design