adding more UI, refine margin