edit boundaries / finish new ui alignment