big cleanup of UI toggles, removed lots of redundancy,ect.