add timezone and home button
fixed conflicts