Started on a new, cleaner GUI