Added some design and UX aspects.