fix conflicts in front view and home controller