Commit 9

Changed navigation to form type with buttons