UI changes and fixed issues