Made initial UI reorganization.