Cleaned up the UI a little, to improve spacing, borders, etc.