new layout, watch improvements, and reload improvements