Improved server routing & added static serving