Revert 7958ee5..1796425

This rolls back to commit 7958ee511abcf8b2592c592b2353cbfa783ff137.
Fixed encoder click. Initial work on better LCD handling