fix bug, adjust activity layout