Updated Project to Clean Layout