Few more UI and bug fixes...