switched handheld and android to new layout