Remove header buttons on XS screens
Properly clear the ServiceRegistry cache