Fixed a Bug in ListActivity options switch case

I've also changed two little things in the main layout