Cleaned up Layout Navigation with helper and fixed  #56