Bug fixing and GUI adjusted