Hide empty elements, add some design tweaks