Some minor UI optimizations

Added Images to Buttons