Tweaked the main layout and fixed a bug in the LocationHelper that
caused a crash if the DEBUG flag was set true.