Home controller update

Moved checks to the bottom in an attempt to speed up page loading.