better layout, manage button