Feature/designfixes