added a helper and changed some layout