Updated sorting
Added design phase feature