Not that much of an overhaul, but this will do for now. Might make some new icons too.

Never thought I would use this thing again... Wow, so much has changed as far as interests go. Expect an overhaul sometime soon.