prepare for harbour and make some cleanup in ui