Removing light and dark views in favor of the light one. Made changes to use less.