Restructure of GUI stuffs