Final touches, would be nice to add a async loading indicator but should just keep it simple.