some UI changes, if you hate it, please let me know?