code cleanup on home and layouts views