Improve usability of Interest screens
merge from trunk
merge from lp:~wbrowa/openpetraorg/dev_0001768_Interest_Category