Tidied up layouts
Tidied up Options Menu xml