Improves server design and adds action button