Refactor some variable names and added a few UI tweaks.