Fixing wrongly generated stuff
Correcting navigation layouts