Smoothed out the UI and added a couple bug fixes