fixed UI
Fix some UI and bugs