added new layout to update system, fixed some bugs