Some little UI changes and solved few bugs