Cleaned up foundation views