goto class
reformat
fixed navigation element
Updated tests