Some super changes to gui