Resolve all "@improve" comments in code

Problem/Motivation

We have marked several code parts in homebox with an "@improve" comment. Improve the code, associated with these comments.

Steps to reproduce

Proposed resolution

Improve the code, associated with these comments.

Remaining tasks

User interface changes

API changes

Data model changes