Add Controllers and Routes and update layout