Code Cleanup and tweaking UI