improved the layout design ( copying from alvanista )