Added new unified design