Improve design slightly