Finished UI refactoring and relayouting, added more EOProduct attributes tags