Improve design (more flat)