responsive changes and server tidyup