admin and page improvements