Update GUI design; Add two test cases.