Simply design fixes