Redesign ui, add table, organize the components