Otlets design update, few fixes