views cleaned up to fix feature flow