better layout & menu v0.2