Removed unused code, some UI changes