Adding some UI enhancements and rearranging source files