refactored some UI, fixed layout issues