Added OS specific, and cleaned up GUI