Revert "Settings: complete overhaul/optimizing + drag drop sort + easy dev life"

This reverts commit 670358622a2adb8a35b4a711790953aac84f9786.
fixes

Added NavBarItemPreference.java

Change-Id: I030ea3fcd8a6e3abd090015ee4c5af505c09d287