Fixed issues and combined GUI