1) add new UI elements
2) restructuring package