Bug Fixes and UI Improvements

I did some bug fixes and UI improvements today.