Improved usability of popup masks and unified look.