Finished functionalities of issue #1323, UI needs improvement