Cleaned up interface/began adding settings