Cleaned gui and code