Cleaned up Layout Navigation with Helper and Fixed #56

Looking forward to contributing more to this project.