add options menu to home screen + tidy ups