Issue #223 layout
Issue #223 json builder
Issue #223 layout navbar
Issue #223 update files
Issue #223 remove unneeded spaces