Frontend starting to get in shape