Two way app and server

Need to do: as before with making app look prettier
Two way small changes