Code pruning, cleaned up UI