Merge pull request #284 from LoungeKatt/master

Eclipse pretends it is fixing an unclosed layout with excess
Clean up the layouts and separate paths sections cleanly

See ya when r6 hits Google Play ;)