fixes  #6 :layout fixes and routes changes