changes in UI + code formatting