some layout and UI changes