Finish adding views and a service