Minor front-end tweeks wip