resolve #12 and started working on #13 but it still looks a bit ugly due to the extra span that gets added in by the formating