Pull Request: Design_Assuty_layout_fix

@KhaledHelmy @ahmed93