minor modifications ot ui
minor modifications
merged changes of moving front ent