More progress on front-end :surfer: