Various fixes, added "always show" option