Minor code cleanup and change touchable margin for openning the drawer.