diff --git a/Implemented operations b/Implemented operations
index 7e7070b..d6da228 100644
--- a/Implemented operations	
+++ b/Implemented operations	
@@ -6,3 +6,5 @@
 - Просмотр оплаченных и неоплаченных счетов
 - Интернационализация
 - что-то еще?
+
+- add 404 page
\ No newline at end of file
diff --git a/application.log b/application.log
new file mode 100644
index 0000000..344e49c
--- /dev/null
+++ b/application.log
@@ -0,0 +1,12 @@
+[2018-02-02 10:47:05] ERROR There is an error: java.lang.NullPointerException Default message: null  
+[2018-02-02 10:55:32] ERROR [THYMELEAF][http-nio-80-exec-6] Exception processing template "service/service_user_list": An error happened during template parsing (template: "class path resource [templates/service/service_user_list.html]" - line 122, col 37)  
+[2018-02-02 10:55:32] ERROR Servlet.service() for servlet [dispatcherServlet] in context with path [] threw exception [Request processing failed; nested exception is org.thymeleaf.exceptions.TemplateInputException: An error happened during template parsing (template: "class path resource [templates/service/service_user_list.html]" - line 122, col 37)] with root cause  
+[2018-02-02 10:55:32] ERROR [THYMELEAF][http-nio-80-exec-6] Exception processing template "error": Error resolving template "error", template might not exist or might not be accessible by any of the configured Template Resolvers  
+[2018-02-02 10:55:32] ERROR Servlet.service() for servlet [dispatcherServlet] threw exception  
+[2018-02-02 10:55:32] ERROR Exception Processing ErrorPage[errorCode=0, location=/error]  
+[2018-02-02 10:59:24] ERROR An internal error occurred while trying to authenticate the user.  
+[2018-02-02 12:21:57] ERROR An internal error occurred while trying to authenticate the user.  
+[2018-02-02 12:37:13] ERROR There is an error: java.lang.NullPointerException Default message: null  
+[2018-02-02 12:37:30] ERROR [THYMELEAF][http-nio-80-exec-2] Exception processing template "error": Error resolving template "error", template might not exist or might not be accessible by any of the configured Template Resolvers  
+[2018-02-02 12:37:30] ERROR Servlet.service() for servlet [dispatcherServlet] threw exception  
+[2018-02-02 12:37:30] ERROR Exception Processing ErrorPage[errorCode=0, location=/error]  
diff --git a/pom.xml b/pom.xml
index 5b494fb..ca3ef59 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@
 		<dependency>
 			<groupId>org.thymeleaf.extras</groupId>
 			<artifactId>thymeleaf-extras-springsecurity4</artifactId>
-			<version>2.1.2.RELEASE</version>
+			<version>3.0.2.RELEASE</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
diff --git a/src/main/java/com/epam/lab/mobilepaymentsystem/GlobalControllerExceptionHandler.java b/src/main/java/com/epam/lab/mobilepaymentsystem/GlobalControllerExceptionHandler.java
index d6258f4..dd44956 100644
--- a/src/main/java/com/epam/lab/mobilepaymentsystem/GlobalControllerExceptionHandler.java
+++ b/src/main/java/com/epam/lab/mobilepaymentsystem/GlobalControllerExceptionHandler.java
@@ -1,22 +1,20 @@
 package com.epam.lab.mobilepaymentsystem;
 
+import com.epam.lab.mobilepaymentsystem.controller.ServiceUnitController;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.core.annotation.AnnotationUtils;
-import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.servlet.ModelAndView;
 
-import javax.servlet.http.HttpServletRequest;
-import java.util.Arrays;
-
 @ControllerAdvice
 class GlobalControllerExceptionHandler {
 
     private static final String DEFAULT_ERROR_VIEW = "errorhandler";
-    // TODO: make a pretty page with error stuff and no stack trace
+    private Logger logger = LoggerFactory.getLogger(ServiceUnitController.class);
 
-    @ResponseStatus(HttpStatus.NOT_FOUND)
     @ExceptionHandler(Exception.class)
     public ModelAndView defaultErrorHandler(Exception e) throws Exception {
         ModelAndView mav = new ModelAndView();
@@ -29,10 +27,10 @@ private void introduceErrors(Exception e, ModelAndView mav) throws Exception {
             throw e;
         }
 
-        String s = Arrays.deepToString(e.getStackTrace());
         mav.addObject("exception", e.toString());
-        mav.addObject("stackTrace", s);
         mav.addObject("message", e.getMessage());
         mav.setViewName(DEFAULT_ERROR_VIEW);
+        e.printStackTrace();
+        logger.error("There is an error: " + e.toString() + " Default message: " + e.getMessage(), e);
     }
 }
diff --git a/src/main/java/com/epam/lab/mobilepaymentsystem/MobilePaymentSystemApplication.java b/src/main/java/com/epam/lab/mobilepaymentsystem/MobilePaymentSystemApplication.java
index 82ae028..f675d91 100644
--- a/src/main/java/com/epam/lab/mobilepaymentsystem/MobilePaymentSystemApplication.java
+++ b/src/main/java/com/epam/lab/mobilepaymentsystem/MobilePaymentSystemApplication.java
@@ -2,17 +2,7 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.LocaleResolver;
-import org.springframework.web.servlet.config.annotation.EnableWebMvc;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
-import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;
-import org.springframework.web.servlet.i18n.SessionLocaleResolver;
-
-import java.util.Locale;
 
 @SpringBootApplication
 public class MobilePaymentSystemApplication  extends WebMvcConfigurerAdapter{
diff --git a/src/main/java/com/epam/lab/mobilepaymentsystem/config/MvcConfig.java b/src/main/java/com/epam/lab/mobilepaymentsystem/config/MvcConfig.java
index 207ab49..6ab78b8 100644
--- a/src/main/java/com/epam/lab/mobilepaymentsystem/config/MvcConfig.java
+++ b/src/main/java/com/epam/lab/mobilepaymentsystem/config/MvcConfig.java
@@ -18,7 +18,7 @@ public class MvcConfig extends WebMvcConfigurerAdapter {
     @Bean
     public LocaleResolver localeResolver() {
         SessionLocaleResolver slr = new SessionLocaleResolver();
-        slr.setDefaultLocale(Locale.US);
+        slr.setDefaultLocale(new Locale("ru"));
         return slr;
     }
 
diff --git a/src/main/java/com/epam/lab/mobilepaymentsystem/config/WebSecurityConfig.java b/src/main/java/com/epam/lab/mobilepaymentsystem/config/WebSecurityConfig.java
index a255323..34c952e 100644
--- a/src/main/java/com/epam/lab/mobilepaymentsystem/config/WebSecurityConfig.java
+++ b/src/main/java/com/epam/lab/mobilepaymentsystem/config/WebSecurityConfig.java
@@ -27,18 +27,13 @@ protected void configure(HttpSecurity http) throws Exception {
         http
             .authorizeRequests()
                 .antMatchers(
-                        "/h2/**",
-                        "/registration",
-                        "/profile",
-                        "/bills/**",
-                        "/services/**",
-                        "/users/**",
-                        "/h2/**",
-                        "/test/**",
+                        "/registration", "/h2**",
                         "/resources/**", "/static/**", "/css/**", "/js/**", "/images/**",
                         "/data/**", "/dist/**", "/js/**", "/vendor/**").permitAll()
-//                .antMatchers(
-//                        "/users").access("hasRole('ROLE_ADMIN')")
+                .antMatchers(
+                        "/users**", "/bills**").access("hasRole('ADMIN')")
+                .antMatchers("/profile**",
+                        "/services**").access("hasAnyRole('USER', 'SUBSCRIBER', 'ADMIN')")
                 .anyRequest().authenticated()
                 .and()
             .formLogin()
diff --git a/src/main/java/com/epam/lab/mobilepaymentsystem/controller/BillController.java b/src/main/java/com/epam/lab/mobilepaymentsystem/controller/BillController.java
index 92308ec..a164473 100644
--- a/src/main/java/com/epam/lab/mobilepaymentsystem/controller/BillController.java
+++ b/src/main/java/com/epam/lab/mobilepaymentsystem/controller/BillController.java
@@ -2,27 +2,135 @@
 
 import com.epam.lab.mobilepaymentsystem.model.Bill;
 import com.epam.lab.mobilepaymentsystem.service.BillService;
+import com.epam.lab.mobilepaymentsystem.service.ServiceUnitService;
+import com.epam.lab.mobilepaymentsystem.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+
+import java.util.List;
 
 @Controller
 public class BillController {
 
     private final BillService billService;
+    private final ServiceUnitService serviceUnitService;
+    private final UserService userService;
 
     @Autowired
-    public BillController(BillService billService) {
+    public BillController(BillService billService, ServiceUnitService serviceUnitService, UserService userService) {
         this.billService = billService;
+        this.serviceUnitService = serviceUnitService;
+        this.userService = userService;
     }
 
     @GetMapping("/bills")
     public String getBills(Model model) {
-        Iterable<Bill> oldBills = billService.listAllPaidBillsOfUser();
-        Iterable<Bill> unpaidBills = billService.listAllUnpaidBillsOfUser();
+        List<Bill> oldBills = billService.getAllPaidBillsOfAllUsersOrderedById(); // todo: check
+        List<Bill> unpaidBills = billService.getAllUnpaidBillsOfAllUsersOrderedById();
         model.addAttribute("paidBills", oldBills);
         model.addAttribute("unpaidBills", unpaidBills);
         return "bill/bill_list";
     }
+
+    @GetMapping("/users/{uid}/bills")
+    public String getBillListByUser(@PathVariable final long uid, Model model) {
+        List<Bill> userBills = billService.getAllUnpaidBillsOfUserByUserId(uid);
+        model.addAttribute("currentUserId", userService.getCurrentUserId());
+        model.addAttribute("empty", userBills.isEmpty());
+        model.addAttribute("userBills", userBills);
+        return "bill/bill_user_list";
+    }
+
+    @GetMapping("/users/{uid}/services")
+    public String getServiceListByUser(@PathVariable final long uid, Model model) {
+        List<Bill> userBills = billService.getAllNonExpiredActivePaidServiceOfUserByUserId(uid);
+        List<Bill> userInactiveBills = billService.getAllExpiredActiveServicesOfUserByUserId(uid);
+        model.addAttribute("currentUserId", userService.getCurrentUserId());
+        model.addAttribute("empty", userBills.isEmpty());
+        model.addAttribute("userBills", userBills);
+        model.addAttribute("oldUserServices", userInactiveBills);
+        model.addAttribute("empty2", userInactiveBills.isEmpty());
+        return "service/service_user_list";
+    }
+
+    @GetMapping("/profile/bills")
+    public String getBillListByCurrentUser(Model model) {
+        final long id = userService.getCurrentUserId();
+        List<Bill> userBills = billService.getAllUnpaidBillsOfUserByUserId(id);
+        model.addAttribute("currentUserId", userService.getCurrentUserId());
+        model.addAttribute("empty", userBills.isEmpty());
+        model.addAttribute("userBills", userBills);
+        return "bill/bill_user_list";
+    }
+
+    @GetMapping("/profile/services")
+    public String getServiceListByCurrentUser(Model model) {
+        final long id = userService.getCurrentUserId();
+        List<Bill> userBills = billService.getAllNonExpiredActivePaidServiceOfUserByUserId(id);
+        List<Bill> userInactiveBills = billService.getAllExpiredActiveServicesOfUserByUserId(id);
+        model.addAttribute("currentUserId", userService.getCurrentUserId());
+        model.addAttribute("empty", userBills.isEmpty());
+        model.addAttribute("userBills", userBills);
+        model.addAttribute("oldUserServices", userInactiveBills);
+        model.addAttribute("empty2", userInactiveBills.isEmpty());
+        return "service/service_user_list";
+    }
+
+    @GetMapping("/profile/bills/{bid}")
+    public String getBillUnit(@PathVariable("bid") final long bid,
+                              Model model) {
+        Bill currentBill = billService.getById(bid);
+        model.addAttribute("bill", currentBill);
+        model.addAttribute("service", currentBill.getServiceUnit());
+        model.addAttribute("userId", userService.getCurrentUserId());
+        model.addAttribute("unsubscribeAviable", billService.isNewBill(currentBill));
+        return "bill/bill_item";
+    }
+
+    @GetMapping("/users/{uid}/bills/{bid}")
+    public String getBillUnit(@PathVariable("uid") final long uid,
+                              @PathVariable("bid") final long bid,
+                              Model model) {
+        Bill currentBill = billService.getById(bid);
+        model.addAttribute("bill", currentBill);
+        model.addAttribute("service", currentBill.getServiceUnit());
+        model.addAttribute("userId", uid);
+        model.addAttribute("currentUserId", userService.getCurrentUserId());
+        model.addAttribute("unsubscribeAviable", billService.isNewBill(currentBill));
+        return "bill/bill_item";
+    }
+
+    @PostMapping("/profile/bills/{bid}/unsub")
+    public String unsubscribeFromUnpaidBill(@PathVariable("bid") final long bid) {
+        long uid = userService.getCurrentUserId();
+        serviceUnitService.unsubscribeUserFromServiceByBillAndUserId(billService.getById(bid), uid);
+        return "redirect:/profile/bills";
+    }
+
+    @PostMapping("/users/{uid}/bills/{bid}/unsub")
+    public String unsubscribeFromUnpaidBill(@PathVariable("uid") final long uid,
+                                            @PathVariable("bid") final long bid) {
+        serviceUnitService.unsubscribeUserFromServiceByBillAndUserId(billService.getById(bid), uid);
+        return "redirect:/users/" + uid + "/bills";
+    }
+
+    @PostMapping("/profile/bills/{bid}/pay")
+    public String payUnpaidBill(@PathVariable("bid") final long bid) {
+        long uid = userService.getCurrentUserId();
+        billService.withdrawCashToPayForOneBill(billService.getById(bid),
+                userService.getUserById(uid));
+        return "redirect:/profile/bills";
+    }
+
+    @PostMapping("/users/{uid}/bills/{bid}/pay")
+    public String payUnpaidBill(@PathVariable("uid") final long uid,
+                                @PathVariable("bid") final long bid) {
+        billService.withdrawCashToPayForOneBill(billService.getById(bid),
+                userService.getUserById(uid));
+        return "redirect:/users/" + uid + "/bills";
+    }
 }
diff --git a/src/main/java/com/epam/lab/mobilepaymentsystem/controller/HomeController.java b/src/main/java/com/epam/lab/mobilepaymentsystem/controller/HomeController.java
index 6eb9997..15f7094 100644
--- a/src/main/java/com/epam/lab/mobilepaymentsystem/controller/HomeController.java
+++ b/src/main/java/com/epam/lab/mobilepaymentsystem/controller/HomeController.java
@@ -1,5 +1,6 @@
 package com.epam.lab.mobilepaymentsystem.controller;
 
+import com.epam.lab.mobilepaymentsystem.model.Role;
 import com.epam.lab.mobilepaymentsystem.service.BillService;
 import com.epam.lab.mobilepaymentsystem.service.ServiceUnitService;
 import com.epam.lab.mobilepaymentsystem.service.UserService;
@@ -7,6 +8,7 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 
 @Controller
 public class HomeController {
@@ -26,11 +28,21 @@ public HomeController(UserService userService,
 
     @GetMapping("/")
     public String showHomePage(Model model) {
-        model.addAttribute("numberOfUsers", userService.numberOfUsers());
-        model.addAttribute("numberOfServices", serviceUnitService.numberOfServices());
-        model.addAttribute("numberOfBills", billService.numberOfUnpaidBills());
-        model.addAttribute("numberOfUnpaidBills", billService.numberOfUnpaidBills());
+        model.addAttribute("numberOfSubs", userService.numberOfUsersByRole(
+                Role.ROLE_SUBSCRIBER.getDisplayName()));
+        model.addAttribute("numberOfUsers", userService.numberOfUsersByRole(
+                Role.ROLE_USER.getDisplayName()));
+        model.addAttribute("numberOfServices", serviceUnitService.numberOfAllService());
+        model.addAttribute("numberOfBills", billService.numberOfAllBills());
+        model.addAttribute("numberOfUnpaidBills", billService.numberOfAllUnpaidBills());
         model.addAttribute("userId", userService.getCurrentUserId());
+        model.addAttribute("userRole", userService.getCurrentUser().getRole());
         return "index";
     }
+
+    @PostMapping("/")
+    public String checkBills() {
+        serviceUnitService.globalCheckBill();
+        return "redirect:/";
+    }
 }
diff --git a/src/main/java/com/epam/lab/mobilepaymentsystem/controller/ServiceUnitController.java b/src/main/java/com/epam/lab/mobilepaymentsystem/controller/ServiceUnitController.java
index 3125880..668ff45 100644
--- a/src/main/java/com/epam/lab/mobilepaymentsystem/controller/ServiceUnitController.java
+++ b/src/main/java/com/epam/lab/mobilepaymentsystem/controller/ServiceUnitController.java
@@ -40,9 +40,10 @@ public String serviceAdding(@Valid @ModelAttribute("service") ServiceUnit servic
 
     @GetMapping("/services")
     public String listAllServices(Model model, @ModelAttribute("selectedService") ServiceUnit serviceUnit) {
-        List<ServiceUnit> inactiveServices = serviceUnitService.getAllServicesWithoutSubscribe();
+        List<ServiceUnit> inactiveServices = serviceUnitService.getAllServicesWithoutSubscribeOfUserByUserId(userService.getCurrentUserId());
         model.addAttribute("inactiveServices", inactiveServices);
         model.addAttribute("services", serviceUnitService.getAllServices());
+        model.addAttribute("userRole", userService.getCurrentUser().getRole());
         return "service/service_list";
     }
 
@@ -54,22 +55,7 @@ public String serviceUnitPage(@PathVariable Long id, Model model) {
 
     @PostMapping("/services")
     public String subscribeToService(@ModelAttribute("selectedService") ServiceUnit serviceUnit) {
-        serviceUnitService.subscribeUserToService(serviceUnit.getId());
+        serviceUnitService.subscribeUserToServiceByUserAndServiceId(userService.getCurrentUserId(), serviceUnit.getId());
         return "redirect:/services";
     }
-
-    // TODO: unsubscribe process doesn't return actual data after pressing a button
-    @GetMapping("service/my")
-    public String listActiveServices(@ModelAttribute("selectedService") ServiceUnit serviceUnit, Model model) {
-        List<ServiceUnit> activeServices = userService.getActiveServicesByUserId();
-        model.addAttribute("activeServices", activeServices);
-        return "service/my";
-    }
-
-    @PostMapping("users/{id}/services")
-    public String unsubscribeFromService(@PathVariable Long id,
-                                         @ModelAttribute("selectedService") ServiceUnit serviceUnit) {
-        serviceUnitService.unsubscribeUserFromService(serviceUnit.getId());
-        return "redirect:/users/" + id + "/services";
-    }
 }
diff --git a/src/main/java/com/epam/lab/mobilepaymentsystem/controller/TestController.java b/src/main/java/com/epam/lab/mobilepaymentsystem/controller/TestController.java
deleted file mode 100644
index 96b0bae..0000000
--- a/src/main/java/com/epam/lab/mobilepaymentsystem/controller/TestController.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.epam.lab.mobilepaymentsystem.controller;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-@Controller
-@RequestMapping("/test")
-public class TestController {
-
-    @GetMapping
-    public String showHomePage() {
-        return "test/index";
-    }
-
-    @GetMapping("/login")
-    public String showLoginPage() {
-        return "test/login";
-    }
-
-    @GetMapping("/registration")
-    public String showRegistrationPage() {
-        return "test/registration";
-    }
-
-    @GetMapping("/users")
-    public String showUserList() {
-        return "test/user_list";
-    }
-
-    @GetMapping("/users/{id}")
-    public String showUserPage(@PathVariable Long id, Model model) {
-        model.addAttribute("id", id);
-        return "test/user_item";
-    }
-
-    //////////////
-
-    @GetMapping("/services")
-    public String showServiceList() {
-        return "test/service_list";
-    }
-
-    @GetMapping("/services/{slug}")
-    public String showServiceItem(@PathVariable String slug, Model model) {
-        model.addAttribute("slug", slug);
-        return "test/service_item";
-    }
-
-    @GetMapping("/bills")
-    public String showBillList() {
-        return "test/bill_list";
-    }
-
-    @GetMapping("/bills/{id}")
-    public String showBillItem(@PathVariable Long id, Model model) {
-        model.addAttribute("id", id);
-        return "test/bill_item";
-    }
-}
diff --git a/src/main/java/com/epam/lab/mobilepaymentsystem/controller/UserController.java b/src/main/java/com/epam/lab/mobilepaymentsystem/controller/UserController.java
index 851a07b..d0d7193 100644
--- a/src/main/java/com/epam/lab/mobilepaymentsystem/controller/UserController.java
+++ b/src/main/java/com/epam/lab/mobilepaymentsystem/controller/UserController.java
@@ -1,7 +1,9 @@
 package com.epam.lab.mobilepaymentsystem.controller;
 
 import com.epam.lab.mobilepaymentsystem.model.User;
+import com.epam.lab.mobilepaymentsystem.service.BillService;
 import com.epam.lab.mobilepaymentsystem.service.SecurityService;
+import com.epam.lab.mobilepaymentsystem.service.ServiceUnitService;
 import com.epam.lab.mobilepaymentsystem.service.UserService;
 import com.epam.lab.mobilepaymentsystem.wrapper.IntegerWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -11,25 +13,29 @@
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
-import java.security.Principal;
 
 @Controller
 public class UserController {
 
     private final UserService userService;
     private final SecurityService securityService;
+    private final BillService billService;
+    private final ServiceUnitService serviceUnitService;
 
     @Autowired
     public UserController(UserService userService,
-                          SecurityService securityService) {
+                          SecurityService securityService,
+                          BillService billService,
+                          ServiceUnitService serviceUnitService) {
         this.userService = userService;
         this.securityService = securityService;
+        this.billService = billService;
+        this.serviceUnitService = serviceUnitService;
     }
 
     @GetMapping("/registration")
     public String registration(Model model) {
         model.addAttribute("userForm", new User());
-
         return "user/registration";
     }
 
@@ -55,40 +61,65 @@ public String login(Model model, String error, String logout) {
     @GetMapping("/users")
     public String getUsers(Model model) {
         model.addAttribute("users", userService.getAllUsers());
+        model.addAttribute("userService", userService);
         return "user/user_list";
     }
 
     @GetMapping("/profile")
-    public String showMyProfile(Principal principal) {
-        Long id = userService.getByUsername(principal.getName()).getId();
-        return "redirect:/users/" + id;
+    public String showMyProfile(Model model) {
+        long id = userService.getCurrentUserId();
+        model.addAttribute("user", userService.getCurrentUser());
+        model.addAttribute("myProfile", true);
+        addModelAttributes(model, id);
+        return "user/user_item";
+    }
+
+    @PostMapping("/profile")
+    public String showButtonTopUpBalance(@Valid @ModelAttribute("howMuchToIncrease") IntegerWrapper howMuch,
+                                         BindingResult bindingResult, Model model) {
+        if (bindingResult.hasErrors()) {
+            long id = userService.getCurrentUserId();
+            addModelAttributes(model, id);
+            model.addAttribute("user", userService.getCurrentUser());
+            model.addAttribute("error", true);
+            return "user/user_item";
+        }
+        userService.topUpBalance(userService.getCurrentUserId(), howMuch.getTranche());
+        return "redirect:/profile";
     }
 
     @GetMapping("/users/{id}")
     public String showUserProfile(@PathVariable final Long id, Model model) {
         model.addAttribute("user", userService.getUserById(id));
-        model.addAttribute("howMuchToIncrease", new IntegerWrapper());
+        model.addAttribute("myProfile", false);
+        addModelAttributes(model, id);
         return "user/user_item";
     }
 
-    @PostMapping("/users/{id}/refill")
-    public String showButtonTopUpBalance(@PathVariable final Long id,
-                                         @ModelAttribute("howMuchToIncrease") IntegerWrapper howMuch) {
-        // todo минимальная сумма для пополнения 50
-        userService.topUpBalance(id, howMuch.getTranche());
-        // todo add binding with success message
-        return "redirect:/users/" + id;
+    @PostMapping("/users/{id}/delete")
+    public String deleteUser(@PathVariable final long id) {
+        userService.deleteUserById(id);
+        return "redirect:/users";
     }
 
-    @GetMapping("/profile/services")
-    public String showMyServices(Principal principal) {
-        Long id = userService.getByUsername(principal.getName()).getId();
-        return "redirect:/users/" + id + "/services";
+    @PostMapping("/users/{id}/block")
+    public String blockUser(@PathVariable final long id) {
+        userService.blockUserById(id, false);
+        return "redirect:/users";
     }
 
-    @DeleteMapping("users/{id}/delete")
-    public String deleteUser(@PathVariable final Long id) {
-        userService.deleteUserById(id);
+    @PostMapping("/users/{id}/unblock")
+    public String unblockUser(@PathVariable final long id) {
+        userService.blockUserById(id, true);
         return "redirect:/users";
     }
+
+    private void addModelAttributes(Model model, long userId) {
+        model.addAttribute("currentUserId", userId);
+        model.addAttribute("numberOfServices",
+                serviceUnitService.numberOfAllPaidActiveUserServicesByUserId(userId));
+        model.addAttribute("numberOfBills",
+                billService.numberOfUnpaidBillsOfUserByUserId(userId));
+        model.addAttribute("howMuchToIncrease", new IntegerWrapper());
+    }
 }
diff --git a/src/main/java/com/epam/lab/mobilepaymentsystem/dao/BillsRepository.java b/src/main/java/com/epam/lab/mobilepaymentsystem/dao/BillsRepository.java
index 8b541f9..e8582d9 100644
--- a/src/main/java/com/epam/lab/mobilepaymentsystem/dao/BillsRepository.java
+++ b/src/main/java/com/epam/lab/mobilepaymentsystem/dao/BillsRepository.java
@@ -3,11 +3,24 @@
 import com.epam.lab.mobilepaymentsystem.model.Bill;
 import org.springframework.data.repository.CrudRepository;
 
+import java.sql.Date;
+import java.util.List;
+
 public interface BillsRepository extends CrudRepository<Bill, Long> {
 
     void deleteByUser_IdAndServiceUnit_IdAndPaidFor(long userId, long serviceId, boolean isPaid);
 
-    Bill findBillByUser_IdAndServiceUnit_id(long userId, long serviceId);
+    Bill findBillByUser_IdAndServiceUnit_idAndEndDateBefore(long user_id, long serviceUnit_id, Date endDate);
+
+    List<Bill> findAllByUser_IdAndPaidFor(long userId, boolean isPaid);
+
+    List<Bill> findAllByPaidForOrderByUser_Id(Boolean paidFor);
+
+    List<Bill> findAllByUser_IdAndPaidForAndStartDateLessThanEqualAndEndDateGreaterThanEqualOrderByActualCostDesc(long user_id, Boolean paidFor, Date startDate, Date endDate);
+
+    List<Bill> findAllByUser_IdAndPaidForAndEndDateBefore(long user_id, Boolean paidFor, Date endDate);
+
+    long countAllByPaidFor(Boolean paidFor);
 
-    Iterable<Bill> findAllByUser_IdAndPaidFor(long userId, boolean isPaid);
+    long countAllByPaidForAndUser_Id(Boolean paidFor, long user_id);
 }
diff --git a/src/main/java/com/epam/lab/mobilepaymentsystem/dao/ServiceUnitsRepository.java b/src/main/java/com/epam/lab/mobilepaymentsystem/dao/ServiceUnitsRepository.java
index bafa2d3..05fcbe6 100644
--- a/src/main/java/com/epam/lab/mobilepaymentsystem/dao/ServiceUnitsRepository.java
+++ b/src/main/java/com/epam/lab/mobilepaymentsystem/dao/ServiceUnitsRepository.java
@@ -4,8 +4,12 @@
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Repository
 public interface ServiceUnitsRepository extends CrudRepository<ServiceUnit, Long> {
 
     ServiceUnit findByName(String name);
+
+    List<ServiceUnit> findAll();
 }
diff --git a/src/main/java/com/epam/lab/mobilepaymentsystem/dao/UserRepository.java b/src/main/java/com/epam/lab/mobilepaymentsystem/dao/UserRepository.java
index 540a617..f4ece7d 100644
--- a/src/main/java/com/epam/lab/mobilepaymentsystem/dao/UserRepository.java
+++ b/src/main/java/com/epam/lab/mobilepaymentsystem/dao/UserRepository.java
@@ -9,7 +9,9 @@ public interface UserRepository extends CrudRepository<User, Long> {
 
     User findByUsername(String username);
 
-    void removeById(long id);
-
     User findUserById(long id);
+
+    Iterable<User> findAllByRoleNot(String role);
+
+    long countAllByRole(String role);
 }
diff --git a/src/main/java/com/epam/lab/mobilepaymentsystem/model/Bill.java b/src/main/java/com/epam/lab/mobilepaymentsystem/model/Bill.java
index 6724304..9ade0fb 100644
--- a/src/main/java/com/epam/lab/mobilepaymentsystem/model/Bill.java
+++ b/src/main/java/com/epam/lab/mobilepaymentsystem/model/Bill.java
@@ -8,10 +8,10 @@
 @Table(name = "bills")
 public class Bill extends AbstractEntity {
 
-    @ManyToOne (cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+    @ManyToOne (cascade = CascadeType.DETACH, fetch = FetchType.LAZY)
     private User user;
 
-    @ManyToOne (cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+    @ManyToOne (cascade = CascadeType.DETACH, fetch = FetchType.LAZY)
     private ServiceUnit serviceUnit;
 
     @Column(name = "is_paid")
@@ -77,7 +77,6 @@ public void setEndDate(Date endDate) {
         this.endDate = endDate;
     }
 
-    // TODO: fix when we will change Set to List
     @Override
     public int hashCode() {
         return Objects.hash(user.getId(), serviceUnit.getId(), paidFor, actualCost, startDate, endDate);
diff --git a/src/main/java/com/epam/lab/mobilepaymentsystem/model/ServiceUnit.java b/src/main/java/com/epam/lab/mobilepaymentsystem/model/ServiceUnit.java
index ffb308a..dc01faa 100644
--- a/src/main/java/com/epam/lab/mobilepaymentsystem/model/ServiceUnit.java
+++ b/src/main/java/com/epam/lab/mobilepaymentsystem/model/ServiceUnit.java
@@ -58,7 +58,6 @@ public void setDuration(Integer duration) {
         this.duration = duration;
     }
 
-    // todo: fix when we will change Set to List
     @Override
     public int hashCode() {
         return Objects.hash(name, cost, duration);
diff --git a/src/main/java/com/epam/lab/mobilepaymentsystem/service/BillService.java b/src/main/java/com/epam/lab/mobilepaymentsystem/service/BillService.java
index ae0312d..789318d 100644
--- a/src/main/java/com/epam/lab/mobilepaymentsystem/service/BillService.java
+++ b/src/main/java/com/epam/lab/mobilepaymentsystem/service/BillService.java
@@ -6,9 +6,11 @@
 import com.epam.lab.mobilepaymentsystem.model.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.sql.Date;
 import java.util.Calendar;
+import java.util.List;
 
 @Service
 public class BillService {
@@ -29,54 +31,126 @@ public void save(Bill bill) {
         billsRepository.save(bill);
     }
 
-    public void createAndSaveBill(User user, ServiceUnit serviceUnit) {
+    public Bill createAndSaveBill(User user, ServiceUnit serviceUnit) {
         Bill bill = new Bill();
         bill.setUser(user);
         bill.setServiceUnit(serviceUnit);
         bill.setPaidFor(false);
         bill.setActualCost(serviceUnit.getCost());
+        setDateForBill(bill);
 
+        billsRepository.save(bill);
+        return bill;
+    }
+
+    private void setDateForBill(Bill bill) {
         Calendar calendar = Calendar.getInstance();
         bill.setStartDate(new Date(calendar.getTimeInMillis()));
-        int duration = serviceUnit.getDuration();
+        int duration = bill.getServiceUnit().getDuration();
         if (duration <= 0) {
             calendar.set(2038, Calendar.JANUARY, 13);
             // https://en.wikipedia.org/wiki/Year_2038_problem :)
             bill.setEndDate(new Date(calendar.getTimeInMillis()));
         } else {
-            calendar.add(Calendar.DATE, serviceUnit.getDuration());
+            calendar.add(Calendar.DATE, bill.getServiceUnit().getDuration());
             bill.setEndDate(new Date(calendar.getTimeInMillis()));
         }
+    }
 
-        billsRepository.save(bill);
+    public Bill getById(long billId) {
+        return billsRepository.findOne(billId);
     }
 
-    public void deleteUnpaidBill(long userId, long serviceId) {
+    @Transactional
+    public void deleteUnpaidBillByUserIdAndServiceId(long userId, long serviceId) {
         billsRepository.deleteByUser_IdAndServiceUnit_IdAndPaidFor(userId, serviceId, UNPAID);
     }
 
-    public Iterable<Bill> listAllPaidBillsOfUser() {
-        return billsRepository.findAllByUser_IdAndPaidFor(userService.getCurrentUserId(), PAID);
+    private List<Bill> getAllNonExpiredPaidBillsOfUserByUserId(long userId) {
+        return billsRepository.
+                findAllByUser_IdAndPaidForAndStartDateLessThanEqualAndEndDateGreaterThanEqualOrderByActualCostDesc(userId, PAID, getCurrentDate(), getCurrentDate());
     }
 
-    public Iterable<Bill> listAllUnpaidBillsOfUser() {
-        return billsRepository.findAllByUser_IdAndPaidFor(userService.getCurrentUserId(), UNPAID);
+    public List<Bill> getAllUnpaidBillsOfUserByUserId(long userId) {
+        return billsRepository.findAllByUser_IdAndPaidFor(userId, UNPAID);
     }
 
-    public long numberOfPaidBills() {
-        return billsRepository.count();
+    public List<Bill> getAllUnpaidBillsOfAllUsersOrderedById() {
+        return billsRepository.findAllByPaidForOrderByUser_Id(UNPAID);
+    }
+
+    public List<Bill> getAllPaidBillsOfAllUsersOrderedById() {
+        return billsRepository.
+                findAllByPaidForOrderByUser_Id(PAID);
     }
 
-    public long numberOfUnpaidBills() {
+    public long numberOfAllBills() {
         return billsRepository.count();
     }
 
-    public int countTotalSum(Iterable<Bill> bills) {
-        int total = 0;
+    public long numberOfAllUnpaidBills() {
+        return billsRepository.countAllByPaidFor(UNPAID);
+    }
+
+    public long numberOfUnpaidBillsOfUserByUserId(long userId) {
+        return billsRepository.countAllByPaidForAndUser_Id(UNPAID, userId);
+    }
+
+    /**
+     * Withdraw cash to pay for all services of User with ID userId
+     * Find expired active services and try to renew subscription
+     * @param userId id of User
+     */
+    public void withdrawCashToPayForServicesByUserId(long userId) {
+        List<ServiceUnit> serviceUnits = userService.getActiveServicesByUserId(userId);
+        User user = userService.getUserById(userId);
+
+        for (ServiceUnit service : serviceUnits) {
+            Bill bill = getExpiredPaidBillByUserIdAndServiceId(userId, service.getId());
+            if (bill != null) {
+                withdrawCashToPayForOneBill(bill, user);
+            }
+        }
+
+        userService.updateUser(user);
+    }
+
+    public void withdrawCashToPayForOneBill(Bill bill, User user) {
+        if (bill.getActualCost() <= user.getBankAccount()) {
+            int bankAccount = user.getBankAccount() - bill.getActualCost();
+            user.setBankAccount(bankAccount);
+            bill.setPaidFor(true);
+            setDateForBill(bill);
+            save(bill);
+        }
+    }
+
+    private Date getCurrentDate() {
+        return new Date(System.currentTimeMillis());
+    }
+
+    private Bill getExpiredPaidBillByUserIdAndServiceId(long userId, long serviceId) {
+        return billsRepository.findBillByUser_IdAndServiceUnit_idAndEndDateBefore(userId, serviceId, getCurrentDate());
+    }
 
-        for (Bill bill: bills) {
-            total += bill.getActualCost();
+    public boolean isNewBill(Bill bill) {
+        if (bill.getUser().getServiceUnits().contains(bill.getServiceUnit())) {
+            return bill.getEndDate().compareTo(getCurrentDate()) >= 0;
         }
-        return total;
+        return false;
+    }
+
+    public List<Bill> getAllNonExpiredActivePaidServiceOfUserByUserId(long userId) {
+        List<Bill> allServices = getAllNonExpiredPaidBillsOfUserByUserId(userId);
+
+        allServices.removeIf(bill -> !bill.getUser().getServiceUnits().contains(bill.getServiceUnit()));
+        return allServices;
+    }
+
+    public List<Bill> getAllExpiredActiveServicesOfUserByUserId(long userId) {
+        List<Bill> bills = billsRepository.findAllByUser_IdAndPaidForAndEndDateBefore(userId, PAID, getCurrentDate());
+
+        bills.removeIf(bill -> !bill.getUser().getServiceUnits().contains(bill.getServiceUnit()));
+        return bills;
     }
 }
diff --git a/src/main/java/com/epam/lab/mobilepaymentsystem/service/ServiceUnitService.java b/src/main/java/com/epam/lab/mobilepaymentsystem/service/ServiceUnitService.java
index 9efea73..5f16ee7 100644
--- a/src/main/java/com/epam/lab/mobilepaymentsystem/service/ServiceUnitService.java
+++ b/src/main/java/com/epam/lab/mobilepaymentsystem/service/ServiceUnitService.java
@@ -1,10 +1,12 @@
 package com.epam.lab.mobilepaymentsystem.service;
 
 import com.epam.lab.mobilepaymentsystem.dao.ServiceUnitsRepository;
+import com.epam.lab.mobilepaymentsystem.model.Bill;
 import com.epam.lab.mobilepaymentsystem.model.ServiceUnit;
 import com.epam.lab.mobilepaymentsystem.model.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
 
@@ -33,9 +35,9 @@ public Iterable<ServiceUnit> getAllServices() {
         return serviceUnitsRepository.findAll();
     }
 
-    public List<ServiceUnit> getAllServicesWithoutSubscribe() {
-        List<ServiceUnit> services = (List<ServiceUnit>) serviceUnitsRepository.findAll();
-        User user = userService.getCurrentUser();
+    public List<ServiceUnit> getAllServicesWithoutSubscribeOfUserByUserId(long userId) {
+        List<ServiceUnit> services = serviceUnitsRepository.findAll();
+        User user = userService.getUserById(userId);
         Set<ServiceUnit> userServices = user.getServiceUnits();
         services.removeAll(userServices);
         return services;
@@ -49,37 +51,54 @@ public ServiceUnit getServiceById(Long id) {
         return serviceUnitsRepository.findOne(id);
     }
 
-    public long numberOfServices() {
+    public long numberOfAllService() {
         return serviceUnitsRepository.count();
     }
 
-    public void subscribeUserToService(long serviceId) {
-        // if we chose actual existing service
+    public long numberOfAllPaidActiveUserServicesByUserId(long userId) {
+        return billService.getAllNonExpiredActivePaidServiceOfUserByUserId(userId).size()
+                + billService.getAllExpiredActiveServicesOfUserByUserId(userId).size();
+    }
+
+    /**
+     * Subscribe User with ID userId to Service with ID serviceID
+     * Withdraw cash at the moment of subscribing
+     * Create paid bill if payment is successful
+     * Create unpaid bill if payment is unsuccessful
+     * Already existing Service cannot be subscribed to User
+     * @param userId ID of User
+     * @param serviceId ID of Service
+     */
+    public void subscribeUserToServiceByUserAndServiceId(long userId, long serviceId) {
         if (serviceId != -1) {
-            User user = userService.getCurrentUser();
+            User user = userService.getUserById(userId);
             ServiceUnit service = getServiceById(serviceId);
 
-            // we create bill only if the service is new
             if (user.addService(service)) {
-                billService.createAndSaveBill(user, service);
+                Bill bill = billService.createAndSaveBill(user, service);
+                billService.withdrawCashToPayForOneBill(bill, user);
                 userService.updateUser(user);
             }
         }
     }
 
-    public void unsubscribeUserFromService(long serviceId) {
-        User user = userService.getCurrentUser();
-        ServiceUnit service = getServiceById(serviceId);
+    /**
+     * Unsubscribe User from Service
+     * Delete unpaid Bill of this Service from User in process
+     * Service cannot be unsubscribed if User doesn't have it
+     * @param bill Bill that contains information about User subscribed to Service
+     * @param userId ID of User
+     */
+    public void unsubscribeUserFromServiceByBillAndUserId(Bill bill, long userId) {
+        User user = userService.getUserById(userId);
+        ServiceUnit service = getServiceById(bill.getServiceUnit().getId());
 
-        // if service exists and it is unpaid - remove also unpaid bill
         if (user.removeService(service)) {
             userService.updateUser(user);
-            billService.deleteUnpaidBill(user.getId(), serviceId);
+            billService.deleteUnpaidBillByUserIdAndServiceId(userId, service.getId());
         }
     }
 
-
-    // TODO: error about problems with cost doesn't appear
     public String validateNewServiceAndAdd(ServiceUnit serviceUnit, BindingResult bindingResult, Model model) {
         if(getByServiceName(serviceUnit.getName()) != null) {
             bindingResult.reject("name");
@@ -87,11 +106,28 @@ public String validateNewServiceAndAdd(ServiceUnit serviceUnit, BindingResult bi
         }
 
         if(bindingResult.hasErrors()) {
-            // TODO: info about other errors!
             return "service/service_add";
         }
 
         save(serviceUnit);
         return "redirect:/services";
     }
+
+    public void globalCheckBill() {
+        Iterable<User> users = userService.getAllUsers();
+        for (User user : users) {
+           localCheckBill(user.getId());
+        }
+    }
+
+    @Transactional
+    public void localCheckBill(long userId) {
+        List<Bill> outOfDateUnpaidBills = billService.getAllUnpaidBillsOfUserByUserId(userId);
+
+        for (Bill bill : outOfDateUnpaidBills) {
+            unsubscribeUserFromServiceByBillAndUserId(bill, userId);
+        }
+
+        billService.withdrawCashToPayForServicesByUserId(userId);
+    }
 }
diff --git a/src/main/java/com/epam/lab/mobilepaymentsystem/service/UserService.java b/src/main/java/com/epam/lab/mobilepaymentsystem/service/UserService.java
index 7595462..1c701fd 100644
--- a/src/main/java/com/epam/lab/mobilepaymentsystem/service/UserService.java
+++ b/src/main/java/com/epam/lab/mobilepaymentsystem/service/UserService.java
@@ -34,12 +34,22 @@ private void addUser(User user) {
         userRepository.save(user);
     }
 
-    public void deleteUserById(Long id) {
+    public void deleteUserById(long id) {
         User user = userRepository.findUserById(id);
         user.setRole(Role.ROLE_DELETED.getDisplayName());
         userRepository.save(user);
     }
 
+    public void blockUserById(long id, boolean isAlreadyBlocked) {
+        User user = userRepository.findUserById(id);
+        String role = Role.ROLE_LOCKED.getDisplayName();
+        if (isAlreadyBlocked) {
+            role = Role.ROLE_SUBSCRIBER.getDisplayName();
+        }
+        user.setRole(role);
+        userRepository.save(user);
+    }
+
     public void topUpBalance(Long id, Integer tranche) {
         User user = getUserById(id);
         if (user.getRole().equals(Role.ROLE_USER.getDisplayName())) {
@@ -47,7 +57,7 @@ public void topUpBalance(Long id, Integer tranche) {
         }
 
         user.setBankAccount(user.getBankAccount() + tranche);
-        user = updateUser(user);
+        updateUser(user);
     }
 
     public User getByUsername(String username) {
@@ -59,11 +69,16 @@ public User getUserById(Long id) {
     }
 
     public Iterable<User> getAllUsers() {
-        return userRepository.findAll();
+        return userRepository.findAllByRoleNot(
+                Role.ROLE_DELETED.getDisplayName());
     }
 
-    public long numberOfUsers() {
-        return userRepository.count();
+    public long numberOfUsersByRole(String role) {
+        return userRepository.countAllByRole(role);
+    }
+
+    public void updateUser(User user) {
+        userRepository.save(user);
     }
 
     public Long getCurrentUserId() {
@@ -81,34 +96,38 @@ public User getCurrentUser() {
         return userRepository.findByUsername(userSecurity.getUsername());
     }
 
-    public User updateUser(User user) {
-        return userRepository.save(user);
-    }
-
-    public List<ServiceUnit> getActiveServicesByUserId() {
-        User user = getCurrentUser();
+    public List<ServiceUnit> getActiveServicesByUserId(long userId) {
+        User user = getUserById(userId);
         return new ArrayList<>(user.getServiceUnits());
     }
 
-    // TODO: not sure about working with model in backend
-    // On the other hand validation logic being in frontend is bad
-    // And maybe it is better to autowire SecurityService in UserService instead of passing it as param
     public String validateNewUserAndRegister(User user, BindingResult bindingResult, Model model, SecurityService securityService) {
 
-        if(getByUsername(user.getUsername()) != null) {
+        if((getByUsername(user.getUsername()) != null) && (!user.getPassword().equals(user.getConfirmPassword()))) {
             bindingResult.reject("username");
+            bindingResult.reject("password");
             model.addAttribute("userWithSameUserName", "There is already a user registered with the username provided");
+            model.addAttribute("passwordsNotSame", "Passwords don't match");
             return "user/registration";
         }
 
-        if(!user.getPassword().equals(user.getConfirmPassword())) {
+        if(getByUsername(user.getUsername()) != null) {
+            bindingResult.reject("username");
+            model.addAttribute(
+                    "userWithSameUserName",
+                    "There is already a user registered with the username provided");
+            return "user/registration";
+        }
+
+        if (!user.getPassword().equals(user.getConfirmPassword())) {
             bindingResult.reject("password");
-            model.addAttribute("passwordsNotSame", "Passwords don't match");
+            model.addAttribute(
+                    "passwordsNotSame",
+                    "Passwords don't match");
             return "user/registration";
         }
 
-        if(bindingResult.hasErrors()) {
-            // TODO: info about other errors
+        if (bindingResult.hasErrors()) {
             return "user/registration";
         }
 
diff --git a/src/main/java/com/epam/lab/mobilepaymentsystem/wrapper/IntegerWrapper.java b/src/main/java/com/epam/lab/mobilepaymentsystem/wrapper/IntegerWrapper.java
index 834a080..59bf5c1 100644
--- a/src/main/java/com/epam/lab/mobilepaymentsystem/wrapper/IntegerWrapper.java
+++ b/src/main/java/com/epam/lab/mobilepaymentsystem/wrapper/IntegerWrapper.java
@@ -1,8 +1,13 @@
 package com.epam.lab.mobilepaymentsystem.wrapper;
 
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+
 public class IntegerWrapper {
 
-    private int tranche = 0;
+    @Min(50)
+    @Max(1000)
+    private int tranche;
 
     public int getTranche() {
         return tranche;
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 85f567b..b7066de 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,7 +1,7 @@
 server.port=80
 server.error.whitelabel.enabled=false
 
-spring.thymeleaf.cache=false
+spring.thymeleaf.cache=true
 spring.thymeleaf.enabled=true
 spring.thymeleaf.prefix=classpath:/templates/
 spring.thymeleaf.suffix=.html
@@ -21,3 +21,10 @@ spring.datasource.driver-class-name=org.h2.Driver
 # Spring Security / Queries for AuthenticationManagerBuilder
 spring.queries.users-query=select password, username from USERS where username=?
 spring.queries.roles-query=select u.username, r.role from user u inner join user_role ur on(u.user_id=ur.user_id) inner join role r on(ur.role_id=r.role_id) where u.email=?
+
+# Logging
+logging.level.root= ERROR
+logging.file=application.log
+logging.pattern.file=[%d{yyyy-MM-dd HH:mm:ss}] %level %msg %nopex %n
+logging.pattern.console=[%d{yyyy-MM-dd HH:mm:ss}] %ex{5} %n
+logging.level.org.springframework.web=ERROR
diff --git a/src/main/resources/data-h2.sql b/src/main/resources/data-h2.sql
index 2808e76..a69162d 100644
--- a/src/main/resources/data-h2.sql
+++ b/src/main/resources/data-h2.sql
@@ -1,25 +1,31 @@
--- pass: admin
+-- ADMIN -- login: admin, pass: admin
+-- SUBSCRIBER -- login: subscriber, pass: 123456
+-- USER -- login: userr, pass: qwerty
+-- LOCKED -- login: locked, pass: qwerty
+-- DELETED -- login: deleted, pass: qwerty
 INSERT INTO USERS (username, fullname, bankaccount, password, role)
-VALUES ('admin', 'Admin Adminski', 99999, '$2a$10$hW7TdoUPWhEdprtj0XjCJ.iDopWV2UUaHWp2l7FoK3mRbLTX7W81q', 'ROLE_ADMIN');
-
--- pass: 123456
-INSERT INTO USERS (username, fullname, bankaccount, password, role)
-VALUES ('vlavik', 'Vladimir Kostin', 435, '$2a$10$Q7vEKw6rzmpNulORJMheF./2QAjAq15fGzCoSoZgSj02jHaOITxRi', 'ROLE_SUBSCRIBER');
-
--- pass: qwerty
-INSERT INTO USERS (username, fullname, bankaccount, password, role)
-VALUES ('boy', 'Anton Pavlov', 582, '$2a$10$fPK7rqD0QjOBVGp9YdxnfOxBBX2ZSdiNp3wCp1nlLIxQf6EAaOlsK', 'ROLE_USER');
-
--- pass: qwerty
-INSERT INTO USERS (username, fullname, bankaccount, password, role)
-VALUES ('dram', 'Bertolt Breckht', 943, '444', 'ROLE_SUBSCRIBER');
+VALUES
+        ('admin', 'Vladimir Kostin', 99999, '$2a$10$hW7TdoUPWhEdprtj0XjCJ.iDopWV2UUaHWp2l7FoK3mRbLTX7W81q', 'ROLE_ADMIN'),
+        ('mikey', 'Marsel Allaiarov', 435, '$2a$10$fPK7rqD0QjOBVGp9YdxnfOxBBX2ZSdiNp3wCp1nlLIxQf6EAaOlsK', 'ROLE_SUBSCRIBER'),
+        ('stranger', 'Bill Gates', 107, '$2a$10$fPK7rqD0QjOBVGp9YdxnfOxBBX2ZSdiNp3wCp1nlLIxQf6EAaOlsK', 'ROLE_LOCKED'),
+        ('exceptional', 'Gryu Felonius', 0, '$2a$10$fPK7rqD0QjOBVGp9YdxnfOxBBX2ZSdiNp3wCp1nlLIxQf6EAaOlsK', 'ROLE_LOCKED');
 
 --
-INSERT INTO SERVICES (cost, name, description)
-VALUES (40, 'Интеллектуальный диктофон',
-        'Не думайте, забудете Вы информацию или нет — просто наберите Вашего помощника! Мы запишем текст под диктовку и перешлём Вам на почту.');
+INSERT INTO SERVICES (cost, duration, name, description)
+VALUES
+        (40, 2, 'Интеллектуальный диктофон',
+        'Не думайте, забудете Вы информацию или нет — просто наберите Вашего помощника! ' ||
+        'Мы запишем текст под диктовку и перешлём Вам на почту.'),
+        (130, 5, 'Ведение телефонных переговоров по Вашему поручению',
+         'Позвоним • дозвонимся в самые недоступные организации ' ||
+         '• договоримся и добьёмся того, что Вам необходимо.'),
+         (200, 30, 'Красивый телефонный звонок',
+         'Подарите звонящему минутку Шопена.');
 
-INSERT INTO SERVICES (cost, name, description)
-VALUES (130, 'Ведение телефонных переговоров по Вашему поручению',
-        'Позвоним • дозвонимся в самые недоступные организации • договоримся и добьёмся того, что Вам необходимо.');
+INSERT INTO USER_SERVICES (user_id, service_id) VALUES (2, 1), (2, 2), (2, 3);
 
+INSERT INTO BILLS (actual_cost, is_paid, start_date, end_date, service_unit_id, user_id)
+VALUES
+        (40, TRUE, '2017-02-01', '2017-02-03', 1, 2),
+        (100, TRUE, '2018-02-01', '2018-02-06', 2, 2),
+        (200, FALSE, '2018-01-31', '2018-03-01', 3, 2);
\ No newline at end of file
diff --git a/src/main/resources/messages.properties b/src/main/resources/messages.properties
index 14a8b23..0a0057c 100644
--- a/src/main/resources/messages.properties
+++ b/src/main/resources/messages.properties
@@ -1,7 +1,9 @@
 app.title=Mobile Payment System
-app.version=v1.0.beta
+app.version=v1.1.demo
 app.project.title=Проект №7. Система Телефонная станция.
 app.project.description=Администратор осуществляет подключение Абонентов. Абонент может выбрать одну или несколько из предоставляемых Услуг. Абонент оплачивает счет за разговоры и услуги. Администратор может просмотреть список неоплаченных счетов и заблокировать абонента.
+app.header.myprofile=Мой профиль
+app.header.logout=Выйти
 
 app.add-item=Добавить новую
 app.create-user=Create User
@@ -10,14 +12,32 @@ app.user-details=User Details
 lang.english=Английский
 lang.russian=Русский
 
+role.user.greeting=Добро пожаловать!
+role.user.text=Для того, чтобы иметь возможность выбирать и оплачивать услуги, Вы должны иметь статус <strong>Абонента</strong>, который присваивается сразу после первого пополнения Вашего лицевого счета.
+role.user.refill=Перейти к пополнению счета
+
+services.new.brief=Краткая информация
+services.new.points=<li>Ниже вы можете ознакомиться со списком предоставляемых услуг.</li><li>Для того, чтобы добавить нужную услугу, выберете ее название в поле ниже и нажмите кнопку "Добавить".</li><li>После этого будет сформирован соответствующий счет, который нужно будет оплатить в ближайшее время.</li><li>Все услуги имеют свою продолжительность, будьте внимательны.</li>
+services.new.select-text=Выберите сервис, чтобы подписаться
+services.new.subscribe=Подписаться
+services.item.name=Название
+services.item.description=Описание
+services.item.cost=Стоимость
+services.item.duration=Длительность
+services.item.backtolist=Вернуться к списку услуг
+services.old=Истекшие услуги
+
 title.page.home=Обзор
+title.page.home.locked=К сожалению, Ваш аккаунт заблокирован. Свяжитесь с администрацией для решения вопроса.
+title.page.home.deleted=Ваш аккаунт удален.
+title.page.check.button=Оплатить счета
 title.page.users=Пользователи
 title.page.user-item=Профиль пользователя
 title.page.services=Список услуг
 title.page.services.add=Добавление новой услуги
+title.page.bills=Список счетов
+title.page.bill-item=Счет
 
-sidebar.myservices.title=Мои услуги
-sidebar.myservices.none=Услуг пока нет...
 sidebar.link.homepage=Главная
 sidebar.link.users=Пользователи
 sidebar.link.services=Услуги
@@ -26,38 +46,61 @@ sidebar.link.services.my=Мои услуги
 sidebar.link.bills=Счета
 sidebar.link.bills.all=Все счета
 sidebar.link.bills.unpaid=Неоплаченные счета
+sidebar.copyrights.title=Все права защищены
+sidebar.copyrights.date=EPAM-SPB © 2018
 
 container.word.unpaid=Неоплаченные
+container.word.subscribers=Абоненты
+container.word.unconfirmed=Неподтвержденных
+container.word.view-details=Подробнее
 
-user.id=ID
-user.username=Username
-user.fullname=Fullname
-user.password=Password
-user.confirmPassword=Confirm password
-user.bankBook=Bank book
-user.role=Role
-user.services=Services
-user.profile=Profile
+bills.table.paid.title=Оплаченные счета
+bills.table.unpaid.title=Неоплаченные счета
+bills.table.th.service=Услуга
+bills.table.th.cost=Цена
+bills.table.th.start-date=С
+bills.table.th.end-date=До
+bills.table.th.owner=Владелец
+bills.item.order=Заказ
+bills.item.payer=Плательщик:
+bills.item.receiver=Получатель:
+bills.item.method=Способ платежа:
+bills.item.cash=Наличные
+bills.item.start-date=С какого:
+bills.item.end-date=По какое:
+bills.item.summary=Информация об услуге
+bills.item.status=Статус
+bills.item.status.paid=ОПЛАЧЕНО
+bills.item.status.unpaid=НЕ ОПЛАЧЕНО
+bills.item.price=Цена, $
+bills.item.button.pay=Оплатить
+bills.item.button.cancel=Отказаться
 
-user.form.submit=Submit
-user.form.reset=Reset
-user.add-more-users=Add More Users
+users.list.title=Список всех активных пользователей
+users.list.table.fullname=Полное имя
+users.list.table.username=Логин
+users.list.table.bankbook=Лицевой счет
+users.list.table.group=Группа
+users.list.table.actions=Действия
+users.item.refill=Пополнить
 
 error.user.id=ID должно содержать от 3 до 10 символов
 error.user.name=Имя пользователя должно содержать от 5 до 20 символов.
+error.tranche=Вводимое значение должно находиться в диапазоне от 50 до 1000.
 
 service.form.header=Создание новой услуги
 service.form.add.name=Название услуги
 service.form.add.description=Краткое описание услуги
 service.form.add.cost=Стоимость услуги
+service.form.add.duration=Введите длительность услуги
 service.form.button.submit=Добавить услугу
 
-service_adding=Добавление услуг
-service_list=Список услуг
-service_name=Название услуги
-service_cost=Стоимость услуги
-service_description=Описание услуги
+global.isEmpty=Этот список в настоящее время пуст.
+
 name=Имя
 cost=Стоимость
 submit=Добавить
 lang.change=Изменить язык
+users.list.table.button.delete=Удалить
+users.list.table.button.block=Заблокировать
+users.list.table.button.unblock=Разблокировать
diff --git a/src/main/resources/messages_en.properties b/src/main/resources/messages_en.properties
index 0e51524..3e9245e 100644
--- a/src/main/resources/messages_en.properties
+++ b/src/main/resources/messages_en.properties
@@ -1,7 +1,9 @@
 app.title=Mobile Payment System
-app.version=v1.0.beta
+app.version=v1.1.demo
 app.project.title=Project #7. Mobile Payment System.
 app.project.description=The administrator connects subscribers. The subscriber can choose one or several of the provided services. The subscriber pays the bill for calls and services. The administrator can view the list of unpaid invoices and block the subscriber.
+app.header.myprofile=My profile
+app.header.logout=Logout
 
 app.add-item=Add new
 app.create-user=Create User
@@ -10,14 +12,32 @@ app.user-details=User Details
 lang.english=English
 lang.russian=Russian
 
+role.user.greeting=Welcome!
+role.user.text=In order to be able to choose and pay for services, you must have the status of <strong>Subscriber</strong>, which is assigned immediately after the first replenishment of your personal account.
+role.user.refill=Go to account replenishment
+
+services.new.brief=Brief information
+services.new.points=<li>Below you can see the list of services provided.</li><li>To add the desired service, select its name in the box below and click the "Subscribe" button.</li><li>A corresponding account has been generated and will need to be paid in the near future.</li><li>All services have their own duration, please be careful.</li>
+services.new.select-text=Select new service to subscribe
+services.new.subscribe=Subscribe
+services.item.name=Name
+services.item.description=Description
+services.item.cost=Cost
+services.item.duration=Duration
+services.item.backtolist=Back to services
+services.old=Expired services
+
 title.page.home=Summary
+title.page.home.locked=Unfortunately, your account has been suspended. Contact the administration to resolve the issue.
+title.page.home.deleted=Your account has been deleted.
+title.page.check.button=Check bills
 title.page.users=User list
 title.page.user-item=User profile
 title.page.services=Service list
 title.page.services.add=Add new service
+title.page.bills=Bill list
+title.page.bill-item=Invoice
 
-sidebar.myservices.title=My services
-sidebar.myservices.none=No services yet...
 sidebar.link.homepage=Homepage
 sidebar.link.users=Users
 sidebar.link.services=Services
@@ -26,8 +46,43 @@ sidebar.link.services.my=My services
 sidebar.link.bills=Bills
 sidebar.link.bills.all=All bills
 sidebar.link.bills.unpaid=Unpaid bills
+sidebar.copyrights.title=All rights reserved
+sidebar.copyrights.date=EPAM-SPB (c) 2018
 
 container.word.unpaid=Unpaid
+container.word.subscribers=Subscribers
+container.word.unconfirmed=Unconfirmed
+container.word.view-details=View details
+
+bills.table.paid.title=Paid bills
+bills.table.unpaid.title=Unpaid bills
+bills.table.th.service=Service
+bills.table.th.cost=Cost
+bills.table.th.start-date=From
+bills.table.th.end-date=To
+bills.table.th.owner=Owner
+bills.item.order=Order
+bills.item.payer=Billed To:
+bills.item.receiver=Payment receiver:
+bills.item.method=Payment Method:
+bills.item.cash=Cash
+bills.item.start-date=Order Date From:
+bills.item.end-date=Order Date To:
+bills.item.summary=Order summary
+bills.item.status=Status
+bills.item.status.paid=PAID
+bills.item.status.unpaid=UNPAID
+bills.item.price=Price, $
+bills.item.button.pay=Pay now
+bills.item.button.cancel=Cancel
+
+users.list.title=List of all active users
+users.list.table.fullname=Fullname
+users.list.table.username=Username
+users.list.table.bankbook=Bank account
+users.list.table.group=Group
+users.list.table.actions=Actions
+users.item.refill=Refill
 
 user.id=ID
 user.username=Username
@@ -45,9 +100,17 @@ user.add-more-users=Add More Users
 
 error.user.id=Id must be between 3 to 10 characters.
 error.user.name=User name must be between 5 to 20 characters.
+error.tranche=The input value should be in range from 50 to 1000.
 
 service.form.header=Create new service
 service.form.add.name=Service name
 service.form.add.description=Service description
 service.form.add.cost=Service cost
-service.form.button.submit=Create service
\ No newline at end of file
+service.form.add.duration=Service duration
+service.form.button.submit=Create service
+
+global.isEmpty=This list is currently empty.
+
+users.list.table.button.delete=Remove
+users.list.table.button.block=Block
+users.list.table.button.unblock=Unblock
\ No newline at end of file
diff --git a/src/main/resources/templates/bill/bill_item.html b/src/main/resources/templates/bill/bill_item.html
index 717c018..e4f32a6 100644
--- a/src/main/resources/templates/bill/bill_item.html
+++ b/src/main/resources/templates/bill/bill_item.html
@@ -11,29 +11,9 @@
     <meta name="description" content="">
     <meta name="author" content="EPAM lab">
 
-    <title>Bill info</title>
+    <title th:text="#{title.page.bill-item}"> Bill</title>
 
-    <!-- Bootstrap Core CSS -->
-    <link href="/vendor/bootstrap/css/bootstrap.min.css" rel="stylesheet">
-
-    <!-- MetisMenu CSS -->
-    <link href="/vendor/metisMenu/metisMenu.min.css" rel="stylesheet">
-
-    <!-- Custom CSS -->
-    <link href="/dist/css/sb-admin-2.css" rel="stylesheet">
-
-    <!-- Morris Charts CSS -->
-    <link href="/vendor/morrisjs/morris.css" rel="stylesheet">
-
-    <!-- Custom Fonts -->
-    <link href="/vendor/font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css">
-
-    <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
-    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-    <!--[if lt IE 9]>
-    <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
-    <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
-    <![endif]-->
+    <div th:replace="fragments/header :: header-css"></div>
 
 </head>
 
@@ -43,114 +23,9 @@
 
     <!-- Navigation -->
     <nav class="navbar navbar-default navbar-static-top" role="navigation" style="margin-bottom: 0">
-        <div class="navbar-header">
-            <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
-                <span class="sr-only">Toggle navigation</span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-            </button>
-            <a class="navbar-brand" href="/test">Mobile Payment System v1.0</a>
-        </div>
-        <!-- /.navbar-header -->
+        <div th:replace="fragments/header :: header"></div>
 
-        <ul class="nav navbar-top-links navbar-right">
-            <li class="dropdown">
-                <select class="selectpicker dropdown-toggle" data-toggle="dropdown" data-width="fit">
-                    <option data-content='<span class="flag-icon flag-icon-us"></span> English'>English</option>
-                    <option data-content='<span class="flag-icon flag-icon-ru"></span> Russia'>Русский</option>
-                </select>
-            </li>
-
-            <li class="dropdown">
-                <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-                    <i class="fa fa-bell fa-fw"></i> <i class="fa fa-caret-down"></i>
-                </a>
-                <ul class="dropdown-menu dropdown-alerts">
-                    <li>
-                        <a href="#">
-                            <div>
-                                <i class="fa fa-tasks fa-fw"></i> You have an unpaid bill
-                                <span class="pull-right text-muted small">Pay now</span>
-                            </div>
-                        </a>
-                    </li>
-                </ul>
-                <!-- /.dropdown-alerts -->
-            </li>
-            <!-- /.dropdown -->
-            <li class="dropdown">
-                <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-                    <i class="fa fa-user fa-fw"></i> <i class="fa fa-caret-down"></i>
-                </a>
-                <ul class="dropdown-menu dropdown-user">
-                    <li><a href="#"><i class="fa fa-user fa-fw"></i> User Profile</a>
-                    </li>
-                    <li class="divider"></li>
-                    <li><a href="/logout"><i class="fa fa-sign-out fa-fw"></i> Logout</a>
-                    </li>
-                </ul>
-                <!-- /.dropdown-user -->
-            </li>
-            <!-- /.dropdown -->
-        </ul>
-        <!-- /.navbar-top-links -->
-
-        <div class="navbar-default sidebar" role="navigation">
-            <div class="sidebar-nav navbar-collapse">
-                <ul class="nav" id="side-menu">
-                    <li class="sidebar-search">
-                        <p>Your services</p>
-                        <p style="color: gray; font-size: 0.9em;"><i>No services yet...</i></p>
-                    </li>
-
-                    <li>
-                        <a href="/test"><i class="fa fa-dashboard fa-fw"></i> Homepage</a>
-                    </li>
-                    <li>
-                        <a href="/test/users"><i class="fa fa-table fa-fw"></i> Users</a>
-                    </li>
-                    <li>
-                        <a href="#"><i class="fa fa-wrench fa-fw"></i> Services<span class="fa arrow"></span></a>
-                        <ul class="nav nav-second-level">
-                            <li>
-                                <a href="/test/services">All services</a>
-                            </li>
-                            <li>
-                                <a href="/test/services">Your services</a>
-                            </li>
-                        </ul>
-                        <!-- /.nav-second-level -->
-                    </li>
-                    <li>
-                        <a href="#"><i class="fa fa-edit fa-fw"></i> Bills<span class="fa arrow"></span></a>
-                        <ul class="nav nav-second-level">
-                            <li>
-                                <a href="/test/bills">All bills</a>
-                            </li>
-                            <li>
-                                <a href="/test/bills">Unpaid bills</a>
-                            </li>
-                        </ul>
-                        <!-- /.nav-second-level -->
-                    </li>
-                    <li>
-                        <a href="#"><i class="fa fa-files-o fa-fw"></i> Smth else...<span class="fa arrow"></span></a>
-                        <ul class="nav nav-second-level">
-                            <li>
-                                <a href="blank.html">Blank Page</a>
-                            </li>
-                            <li>
-                                <a href="../user/login.html">Login Page</a>
-                            </li>
-                        </ul>
-                        <!-- /.nav-second-level -->
-                    </li>
-                </ul>
-            </div>
-            <!-- /.sidebar-collapse -->
-        </div>
-        <!-- /.navbar-static-side -->
+        <div th:replace="fragments/sidebar :: sidebar"></div>
     </nav>
 
     <div id="page-wrapper">
@@ -174,39 +49,41 @@
         </style>
 
 
-        <div class="row">
-            <div class="col-xs-12">
+        <div class="row" th:object="${bill}">
+            <div class="col-xs-12" style="font-size: 1.3em;">
                 <div class="invoice-title">
-                    <h2>Invoice</h2><h3 class="pull-right">Order # <span th:text="${id}"></span></h3>
+                    <h2 th:text="#{title.page.bill-item}">Invoice</h2>
+                    <h3 class="pull-right"><span th:text="#{bills.item.order}">Order</span> # <span th:text="*{id}"></span></h3>
                 </div>
                 <hr>
                 <div class="row">
                     <div class="col-xs-6">
-                        <address>
-                            <strong>Billed To:</strong><br>
-                            Vladimir Kostin<br>
-                            <a href="/test/users/1" target="_blank">vlavik</a><br>
-                        </address>
+                        <strong th:text="#{bills.item.payer}">Billed To:</strong><br>
+                        <p>
+                            <span th:text="${bill.user.fullname}"></span>
+                            (<a th:href="@{'/users/' + ${bill.user.id}}" target="_blank" th:text="${bill.user.username}"></a>)
+                        </p>
+                        <br>
                     </div>
                     <div class="col-xs-6 text-right">
-                        <address>
-                            <strong>Shipped To:</strong><br>
-                            MPS
-                        </address>
+                        <strong th:text="#{bills.item.receiver}">Shipped To:</strong><br>
+                        MPS
                     </div>
                 </div>
                 <div class="row">
                     <div class="col-xs-6">
-                        <address>
-                            <strong>Payment Method:</strong><br>
-                            Cash
-                        </address>
+                        <strong th:text="#{bills.item.method}">Payment Method:</strong><br>
+                        <span th:text="#{bills.item.cash}">Cash</span>
                     </div>
-                    <div class="col-xs-6 text-right">
-                        <address>
-                            <strong>Order Date:</strong><br>
-                            January 23, 2018<br><br>
-                        </address>
+                    <div class="col-xs-6 text-right" th:if="${bill.paidFor == true}">
+                        <div>
+                            <strong th:text="#{bills.item.start-date}">Order Date From:</strong><br>
+                            <p th:text="${#dates.format(bill.startDate, 'dd-MM-yyyy')}"></p>
+                        </div>
+                        <div>
+                            <strong th:text="#{bills.item.end-date}">Order Date To:</strong><br>
+                            <p th:text="${#dates.format(bill.endDate, 'dd-MM-yyyy')}"></p>
+                        </div>
                     </div>
                 </div>
             </div>
@@ -214,92 +91,86 @@ <h2>Invoice</h2><h3 class="pull-right">Order # <span th:text="${id}"></span></h3
         <!-- /.row -->
 
         <div class="row">
-            <div class="col-md-12">
+            <div class="col-md-12" style="font-size: 1.2em; margin-top: 2em;">
                 <div class="panel panel-default">
                     <div class="panel-heading">
-                        <h3 class="panel-title"><strong>Order summary</strong></h3>
+                        <h3 class="panel-title"><strong th:text="#{bills.item.summary}">Order summary</strong></h3>
                     </div>
                     <div class="panel-body">
                         <div class="table-responsive">
                             <table class="table table-condensed">
                                 <thead>
                                 <tr>
-                                    <td><strong>Service</strong></td>
-                                    <td class="text-center"><strong>Price</strong></td>
-                                    <td class="text-center"><strong>Quantity</strong></td>
-                                    <td class="text-right"><strong>Totals</strong></td>
+                                    <td><strong th:text="#{bills.table.th.service}">Service</strong></td>
+                                    <td class="text-center"><strong th:text="#{bills.item.status}">Status</strong></td>
+                                    <td class="text-right"><strong th:text="#{bills.item.price}">Price, $</strong></td>
                                 </tr>
                                 </thead>
                                 <tbody>
                                 <!-- foreach ($order->lineItems as $line) or some such thing here -->
                                 <tr>
-                                    <td>WebTV</td>
-                                    <td class="text-center">$10.99</td>
-                                    <td class="text-center">1</td>
-                                    <td class="text-right">$10.99</td>
-                                </tr>
-                                <tr>
-                                    <td>Kaspersky Crystal</td>
-                                    <td class="text-center">$20.00</td>
-                                    <td class="text-center">3</td>
-                                    <td class="text-right">$60.00</td>
-                                </tr>
-                                <tr>
-                                    <td>Static IP-adress</td>
-                                    <td class="text-center">$600.00</td>
-                                    <td class="text-center">1</td>
-                                    <td class="text-right">$600.00</td>
-                                </tr>
-                                <tr>
-                                    <td class="thick-line"></td>
-                                    <td class="thick-line"></td>
-                                    <td class="thick-line text-center"><strong>Subtotal</strong></td>
-                                    <td class="thick-line text-right">$670.99</td>
-                                </tr>
-                                <tr>
-                                    <td class="no-line"></td>
-                                    <td class="no-line"></td>
-                                    <td class="no-line text-center"><strong>Shipping</strong></td>
-                                    <td class="no-line text-right">$15</td>
-                                </tr>
-                                <tr>
-                                    <td class="no-line"></td>
-                                    <td class="no-line"></td>
-                                    <td class="no-line text-center"><strong>Total</strong></td>
-                                    <td class="no-line text-right">$685.99</td>
-                                </tr>
-                                <tr>
-                                    <td class="no-line"></td>
-                                    <td class="no-line"></td>
-                                    <td class="no-line text-center"><strong>Status</strong></td>
-                                    <td class="no-line text-right" style="color:darkred"><strong>UNPAID</strong></td>
+                                    <td th:text="${service.name}"></td>
+                                    <td class="text-center">
+                                        <span th:if="${bill.paidFor == true}" th:text="#{bills.item.status.paid}"
+                                              style="color:darkgreen">PAID</span>
+                                        <span th:unless="${bill.paidFor == true}" th:text="#{bills.item.status.unpaid}"
+                                              style="color:darkred">UNPAID</span>
+                                    </td>
+                                    <td class="text-right" th:text="${bill.actualCost}"></td>
                                 </tr>
                                 </tbody>
                             </table>
                         </div>
+
+                        <div class="col-md-12" style="margin-bottom: 1em; text-align: right;">
+                            <div th:if="${currentUserId == bill.user.id}" >
+                                <form th:if="${bill.paidFor != true}"
+                                      th:action="@{'/profile/bills/{bid}/pay' (uid=${userId}, bid=${bill.id})}"
+                                      method="post"
+                                      style="float:right; margin-left: 1em;">
+                                    <button type="submit" th:text="#{bills.item.button.pay}"
+                                            class="btn btn-primary">Оплатить</button>
+                                </form>
+                                <form th:action="@{'/users/{uid}/bills/{bid}/unsub' (uid=${userId}, bid=${bill.id})}"
+                                      method="post" th:if="${unsubscribeAviable == true or bill.paidFor == false}">
+                                    <button type="submit" th:text="#{bills.item.button.cancel}"
+                                            class="btn btn-secondary">Отказаться</button>
+                                </form>
+                            </div>
+                            <div th:unless="${currentUserId == bill.user.id}" >
+                                <form th:action="@{'/users/{uid}/bills/{bid}/pay' (uid=${userId}, bid=${bill.id})}"
+                                      method="post" th:if="${bill.paidFor != true}"
+                                      style="float:right; margin-left: 1em;">
+                                    <button type="submit" th:text="#{bills.item.button.pay}"
+                                            class="btn btn-primary">Оплатить</button>
+                                </form>
+                                <form th:action="@{'/users/{uid}/bills/{bid}/unsub' (uid=${userId}, bid=${bill.id})}"
+                                      method="post" th:if="${unsubscribeAviable == true or bill.paidFor == false}">
+                                    <button type="submit" th:text="#{bills.item.button.cancel}"
+                                            class="btn btn-secondary">Отказаться</button>
+                                </form>
+                            </div>
+                        </div>
                     </div>
                 </div>
             </div>
-    </div>
+
+        </div>
+
+
         <!-- /.row -->
+
+
+
     </div>
     <!-- /#page-wrapper -->
 
 </div>
 <!-- /#wrapper -->
 
-<!-- jQuery -->
-<script src="/vendor/jquery/jquery.min.js"></script>
-
-<!-- Bootstrap Core JavaScript -->
-<script src="/vendor/bootstrap/js/bootstrap.min.js"></script>
-
-<!-- Metis Menu Plugin JavaScript -->
-<script src="/vendor/metisMenu/metisMenu.min.js"></script>
-
-<!-- Custom Theme JavaScript -->
-<script src="/dist/js/sb-admin-2.js"></script>
+<div th:replace="fragments/footer :: footer"></div>
 
 </body>
 
 </html>
+
diff --git a/src/main/resources/templates/bill/bill_list.html b/src/main/resources/templates/bill/bill_list.html
index abc645e..5886b28 100644
--- a/src/main/resources/templates/bill/bill_list.html
+++ b/src/main/resources/templates/bill/bill_list.html
@@ -38,63 +38,35 @@ <h1 class="page-header" th:text="#{title.page.bills}">Bill list.</h1>
         <!-- /.row -->
 
 
-        <!--<div class="panel">-->
-            <!--<div class="col-md-12 well">-->
-                <!--<a class="btn btn-primary" data-toggle="modal" data-target="#usuario"><i class="fa fa-fw -square -circle fa-plus-square"></i> Some action</a>-->
-            <!--</div>-->
-        <!--</div>-->
-         <!--/.row -->
-
-        <div class="modal fade" id="confirm-delete" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-            <div class="modal-dialog">
-                <div class="modal-content">
-
-                    <div class="modal-header">
-                        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-                        <h4 class="modal-title" id="myModalLabel">Confirm Delete</h4>
-                    </div>
-
-                    <div class="modal-body">
-                        <p>You are about to delete this user, this procedure is irreversible.</p>
-                        <p>Do you want to proceed?</p>
-                        <p class="debug-url"></p>
-                    </div>
-
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-                        <a class="btn btn-danger btn-ok">Delete</a>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-
         <div class="row">
-            <div class="col-lg-6">
+            <div class="col-lg-7">
                 <div class="panel panel-default">
-                    <div class="panel-heading">
-                        Paid bills
-                    </div>
+                    <div class="panel-heading" th:text="#{bills.table.paid.title}"></div>
                     <!-- /.panel-heading -->
                     <div class="panel-body">
                         <div class="table-responsive">
                             <table class="table table-striped table-bordered table-hover">
                                 <thead>
                                 <tr>
-                                    <th>Name</th>
-                                    <th>Cost</th>
-                                    <th>Start date</th>
-                                    <th>End date</th>
-                                    <th>Paid</th>
+                                    <th th:text="#{bills.table.th.service}">Name</th>
+                                    <th th:text="#{bills.table.th.cost}">Cost</th>
+                                    <th th:text="#{bills.table.th.start-date}">Start date</th>
+                                    <th th:text="#{bills.table.th.end-date}">End date</th>
+                                    <th th:text="#{bills.table.th.owner}">Owner</th>
                                 </tr>
                                 </thead>
                                 <tbody>
                                 <tr th:each="bill : ${paidBills}">
-                                    <td th:text="${bill.serviceUnit.name}"></td>
+                                    <td width="40%">
+                                        <a th:href="@{'/users/{uid}/bills/{bid}' (uid=${bill.user.id}, bid=${bill.id})}"
+                                           th:text="${bill.serviceUnit.name}"></a>
+                                    </td>
                                     <td th:text="${bill.actualCost}"></td>
-                                    <td th:text="${#dates.format(bill.startDate, 'dd-MM-yyyy')}"></td>
-                                    <td th:text="${#dates.format(bill.endDate, 'dd-MM-yyyy')}"></td>
-                                    <td th:text="${bill.paidFor}"></td>
+                                    <td th:text="${#dates.format(bill.startDate, 'dd:MM:yyyy')}"></td>
+                                    <td th:text="${#dates.format(bill.endDate, 'dd:MM:yyyy')}"></td>
+                                    <td>
+                                        <a th:href="@{'/users/' + ${bill.user.id}}" th:text="${bill.user.username}"></a>
+                                    </td>
                                 </tr>
                                 </tr>
                                 </tbody>
@@ -107,31 +79,30 @@ <h4 class="modal-title" id="myModalLabel">Confirm Delete</h4>
                 <!-- /.panel -->
             </div>
             <!-- /.col-lg-6 -->
-            <div class="col-lg-6">
+            <div class="col-lg-5">
                 <div class="panel panel-default">
-                    <div class="panel-heading">
-                        Unpaid bills
-                    </div>
+                    <div class="panel-heading" th:text="#{bills.table.unpaid.title}"></div>
                     <!-- /.panel-heading -->
                     <div class="panel-body">
                         <div class="table-responsive">
-                            <table class="table">
+                            <table class="table table-striped">
                                 <thead>
                                 <tr>
-                                    <th>Name</th>
-                                    <th>Cost</th>
-                                    <th>Start date</th>
-                                    <th>End date</th>
-                                    <th>Paid</th>
+                                    <th th:text="#{bills.table.th.service}">Name</th>
+                                    <th th:text="#{bills.table.th.cost}">Cost</th>
+                                    <th th:text="#{bills.table.th.owner}">Owner</th>
                                 </tr>
                                 </thead>
                                 <tbody>
                                 <tr th:each="bill : ${unpaidBills}">
-                                    <td th:text="${bill.serviceUnit.name}"></td>
+                                    <td>
+                                        <a th:href="@{'/users/{uid}/bills/{bid}' (uid=${bill.user.id}, bid=${bill.id})}"
+                                           th:text="${bill.serviceUnit.name}"></a>
+                                    </td>
                                     <td th:text="${bill.actualCost}"></td>
-                                    <td th:text="${#dates.format(bill.startDate, 'dd-MM-yyyy')}"></td>
-                                    <td th:text="${#dates.format(bill.endDate, 'dd-MM-yyyy')}"></td>
-                                    <td th:text="${bill.paidFor}"></td>
+                                    <td>
+                                        <a th:href="@{'/users/' + ${bill.user.id}}" th:text="${bill.user.username}"></a>
+                                    </td>
                                 </tr>
                                 </tbody>
                             </table>
diff --git a/src/main/resources/templates/bill/bill_user_list.html b/src/main/resources/templates/bill/bill_user_list.html
new file mode 100644
index 0000000..5867b1f
--- /dev/null
+++ b/src/main/resources/templates/bill/bill_user_list.html
@@ -0,0 +1,97 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:th="http://www.thymeleaf.org"
+      xmlns:layout="http://www.w3.org/1999/xhtml">
+
+<head>
+
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta name="description" content="">
+    <meta name="author" content="EPAM lab">
+
+    <title th:text="#{title.page.bills}"> Bill list</title>
+
+    <div th:replace="fragments/header :: header-css"></div>
+
+</head>
+
+<body>
+
+<div id="wrapper">
+
+    <!-- Navigation -->
+    <nav class="navbar navbar-default navbar-static-top" role="navigation" style="margin-bottom: 0">
+        <div th:replace="fragments/header :: header"></div>
+
+        <div th:replace="fragments/sidebar :: sidebar"></div>
+    </nav>
+
+    <div id="page-wrapper">
+        <div class="row">
+            <div class="col-lg-12">
+                <h1 class="page-header" th:text="#{title.page.bills}">Bill list.</h1>
+            </div>
+            <!-- /.col-lg-12 -->
+        </div>
+        <!-- /.row -->
+
+
+        <div class="row">
+            <div class="col-lg-12">
+                <div class="panel panel-default">
+                    <div class="panel-heading" th:text="#{bills.table.unpaid.title}"></div>
+                    <!-- /.panel-heading -->
+                    <div class="panel-body">
+                        <div class="table-responsive">
+                            <table class="table table-striped table-bordered table-hover">
+                                <thead>
+                                <tr>
+                                    <th th:text="#{bills.table.th.service}">Name</th>
+                                    <th th:text="#{bills.table.th.cost}">Cost</th>
+                                    <th th:text="#{bills.table.th.owner}">Owner</th>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                <tr th:each="bill : ${userBills}" th:if="${empty == false}">
+                                    <td th:if="${currentUserId == bill.user.id}">
+                                        <a th:href="@{'/profile/bills/{bid}' (bid=${bill.id})}"
+                                           th:text="${bill.serviceUnit.name}"></a>
+                                    </td>
+                                    <td th:unless="${currentUserId == bill.user.id}">
+                                        <a th:href="@{'/users/{uid}/bills/{bid}' (uid=${bill.user.id}, bid=${bill.id})}"
+                                           th:text="${bill.serviceUnit.name}"></a>
+                                    </td>
+                                    <td th:text="${bill.actualCost}"></td>
+                                    <td th:if="${currentUserId == bill.user.id}">
+                                        <a th:href="@{/profile}" th:text="${bill.user.username}"></a>
+                                    </td>
+                                    <td th:unless="${currentUserId == bill.user.id}">
+                                        <a th:href="@{'/users/' + ${bill.user.id}}" th:text="${bill.user.username}"></a>
+                                    </td>
+                                </tr>
+                                <tr th:unless="${empty == false}"><td colspan="3" th:text="#{global.isEmpty}"></td></tr>
+                                </tbody>
+                            </table>
+                        </div>
+                        <!-- /.table-responsive -->
+                    </div>
+                    <!-- /.panel-body -->
+                </div>
+                <!-- /.panel -->
+            </div>
+            <!-- /.col-lg-12 -->
+        </div>
+        <!-- /.row -->
+    </div>
+    <!-- /#page-wrapper -->
+
+</div>
+<!-- /#wrapper -->
+
+<div th:replace="fragments/footer :: footer"></div>
+
+</body>
+
+</html>
diff --git a/src/main/resources/templates/bill/old.html b/src/main/resources/templates/bill/old.html
deleted file mode 100644
index 42abf98..0000000
--- a/src/main/resources/templates/bill/old.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org" xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-    <meta charset="UTF-8">
-    <title>Bills payment</title>
-</head>
-<body>
-<form action="#" th:action="@{/bills/old}" th:object="${oldBills}" method="get">
-    <div>
-        <h2>Old bill operations</h2>
-        <table>
-            <tr>
-                <th>Name</th>
-                <th>Cost</th>
-                <th>Paid?</th>
-            </tr>
-            <tr th:each="bill : ${oldBills}">
-                <td th:text="${bill.serviceUnit.name}"></td>
-                <td th:text="${bill.serviceUnit.cost}"></td>
-                <td th:text="${bill.paidFor}"></td>
-            </tr>
-        </table>
-    </div>
-    <p th:inline="text">Total cost: [[${total}]]</p>
-    <p><input type="submit" value="Accept"/></p>
-</form>
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/bill/payment.html b/src/main/resources/templates/bill/payment.html
deleted file mode 100644
index 8781133..0000000
--- a/src/main/resources/templates/bill/payment.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org" xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-    <meta charset="UTF-8">
-    <title>Bills payment</title>
-</head>
-<body>
-<form action="#" th:action="@{/bills/payment}" th:object="${unpaidBills}" method="post">
-    <div>
-        <h2>Unpaid bill list</h2>
-        <table>
-            <tr>
-                <th>Name</th>
-                <th>Cost</th>
-                <th>Paid?</th>
-            </tr>
-            <tr th:each="bill : ${unpaidBills}">
-                <td th:text="${bill.serviceUnit.name}"></td>
-                <td th:text="${bill.serviceUnit.cost}"></td>
-                <td th:text="${bill.paidFor}"></td>
-            </tr>
-        </table>
-    </div>
-    <p th:inline="text">Total cost: [[${total}]]</p>
-    <p><input type="submit" value="Accept"/></p>
-</form>
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/fragments/footer.html b/src/main/resources/templates/fragments/footer.html
index fa32ad9..cb3ec07 100644
--- a/src/main/resources/templates/fragments/footer.html
+++ b/src/main/resources/templates/fragments/footer.html
@@ -8,21 +8,21 @@
 
 
     <!-- jQuery -->
-    <script src="../vendor/jquery/jquery.min.js"></script>
+    <script th:src="@{/vendor/jquery/jquery.min.js}"></script>
 
     <!-- Bootstrap Core JavaScript -->
-    <script src="../vendor/bootstrap/js/bootstrap.min.js"></script>
+    <script th:src="@{/vendor/bootstrap/js/bootstrap.min.js}"></script>
 
     <!-- Metis Menu Plugin JavaScript -->
-    <script src="../vendor/metisMenu/metisMenu.min.js"></script>
+    <script th:src="@{/vendor/metisMenu/metisMenu.min.js}"></script>
 
     <!-- DataTables JavaScript -->
-    <script src="../vendor/datatables/js/jquery.dataTables.min.js"></script>
-    <script src="../vendor/datatables-plugins/dataTables.bootstrap.min.js"></script>
-    <script src="../vendor/datatables-responsive/dataTables.responsive.js"></script>
+    <script th:src="@{/vendor/datatables/js/jquery.dataTables.min.js}"></script>
+    <script th:src="@{/vendor/datatables-plugins/dataTables.bootstrap.min.js}"></script>
+    <script th:src="@{/vendor/datatables-responsive/dataTables.responsive.js}"></script>
 
     <!-- Custom Theme JavaScript -->
-    <script src="../dist/js/sb-admin-2.js"></script>
+    <script th:src="@{/dist/js/sb-admin-2.js}"></script>
 
     <!-- Page-Level Demo Scripts - Tables - Use for reference -->
     <script>
diff --git a/src/main/resources/templates/fragments/header.html b/src/main/resources/templates/fragments/header.html
index f10dfa8..bab8dea 100644
--- a/src/main/resources/templates/fragments/header.html
+++ b/src/main/resources/templates/fragments/header.html
@@ -2,28 +2,25 @@
 <head>
     <div th:fragment="header-css">
         <!-- Bootstrap Core CSS -->
-        <link href="../vendor/bootstrap/css/bootstrap.min.css" rel="stylesheet">
+        <link th:href="@{/vendor/bootstrap/css/bootstrap.min.css}" rel="stylesheet">
 
         <!-- MetisMenu CSS -->
-        <link href="../vendor/metisMenu/metisMenu.min.css" rel="stylesheet">
+        <link th:href="@{/vendor/metisMenu/metisMenu.min.css}" rel="stylesheet">
 
         <!-- Custom CSS -->
-        <link href="../dist/css/sb-admin-2.css" rel="stylesheet">
+        <link th:href="@{/dist/css/sb-admin-2.css}" rel="stylesheet">
 
         <!-- DataTables CSS -->
-        <link href="../vendor/datatables-plugins/dataTables.bootstrap.css" rel="stylesheet">
+        <link th:href="@{/vendor/datatables-plugins/dataTables.bootstrap.css}" rel="stylesheet">
 
         <!-- DataTables Responsive CSS -->
-        <link href="../vendor/datatables-responsive/dataTables.responsive.css" rel="stylesheet">
+        <link th:href="@{/vendor/datatables-responsive/dataTables.responsive.css}" rel="stylesheet">
 
         <!-- Morris Charts CSS -->
-        <link href="../vendor/morrisjs/morris.css" rel="stylesheet">
+        <link th:href="@{/vendor/morrisjs/morris.css}" rel="stylesheet">
 
         <!-- Custom Fonts -->
-        <link href="../vendor/font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css">
-
-        <link rel="stylesheet" th:href="@{/css/main.css}"
-              href="../../css/main.css" />
+        <link th:href="@{/vendor/font-awesome/css/font-awesome.min.css}" rel="stylesheet" type="text/css">
 
         <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
         <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
@@ -62,33 +59,17 @@
                 </select></div>
         </li>
 
-        <li class="dropdown">
-            <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-                <i class="fa fa-bell fa-fw"></i> <i class="fa fa-caret-down"></i>
-            </a>
-            <ul class="dropdown-menu dropdown-alerts">
-                <li>
-                    <a href="#">
-                        <div>
-                            <i class="fa fa-tasks fa-fw"></i> You have an unpaid bill
-                            <span class="pull-right text-muted small">Pay now</span>
-                        </div>
-                    </a>
-                </li>
-            </ul>
-            <!-- /.dropdown-alerts -->
-        </li>
-        <!-- /.dropdown -->
         <li class="dropdown">
             <a class="dropdown-toggle" data-toggle="dropdown" href="#">
                 <i class="fa fa-user fa-fw"></i> <i class="fa fa-caret-down"></i>
             </a>
             <ul class="dropdown-menu dropdown-user">
                 <!--[[${#httpServletRequest.remoteUser}]]-->
-                <li><a th:href="@{/profile}"><i class="fa fa-user fa-fw"></i> My profile</a>
+                <li sec:authorize="hasAnyRole('USER', 'SUBSCRIBER', 'ADMIN')">
+                    <a th:href="@{/profile}"><i class="fa fa-user fa-fw"></i> <span th:text="#{app.header.myprofile}"></span> </a>
                 </li>
-                <li class="divider"></li>
-                <li><a th:href="@{/logout}"><i class="fa fa-sign-out fa-fw"></i> Logout</a></li>
+                <li class="divider" sec:authorize="hasAnyRole('USER', 'SUBSCRIBER', 'ADMIN')"></li>
+                <li><a th:href="@{/logout}"><i class="fa fa-sign-out fa-fw"></i> <span th:text="#{app.header.logout}"></span></a></li>
             </ul>
             <!-- /.dropdown-user -->
         </li>
diff --git a/src/main/resources/templates/fragments/sidebar.html b/src/main/resources/templates/fragments/sidebar.html
index 71f9114..0ac08d7 100644
--- a/src/main/resources/templates/fragments/sidebar.html
+++ b/src/main/resources/templates/fragments/sidebar.html
@@ -9,52 +9,31 @@
     <div class="navbar-default sidebar" role="navigation">
         <div class="sidebar-nav navbar-collapse">
             <ul class="nav" id="side-menu">
-                <li class="sidebar-search">
-                    <p th:text="#{sidebar.myservices.title}">Your services</p>
-                    <p style="color: gray; font-size: 0.9em;"><i th:text="#{sidebar.myservices.none}">No services yet...</i></p>
-                </li>
-
                 <li>
                     <a href="/"><i class="fa fa-dashboard fa-fw"></i> <span th:text="#{sidebar.link.homepage}">Homepage</span></a>
                 </li>
-                <li>
+                <li sec:authorize="hasRole('ADMIN')">
                     <a th:href="@{/users}"><i class="fa fa-table fa-fw"></i> <span th:text="#{sidebar.link.users}">Users</span></a>
                 </li>
-                <li>
-                    <a href="#"><i class="fa fa-wrench fa-fw"></i> <span th:text="#{sidebar.link.services}">Services</span><span class="fa arrow"></span></a>
+                <li sec:authorize="hasAnyRole('USER', 'SUBSCRIBER', 'ADMIN')">
+                    <a th:href="@{/services}"><i class="fa fa-wrench fa-fw"></i> <span th:text="#{sidebar.link.services}">Services</span><span class="fa arrow"></span></a>
                     <ul class="nav nav-second-level">
                         <li>
                             <a th:href="@{/services}"><span th:text="#{sidebar.link.services.all}">All services</span></a>
                         </li>
                         <li>
-                            <a th:href="@{/profile/services}"><span th:text="#{sidebar.link.services.my}">Your services</span></a>
+                            <a th:href="@{/profile/services}"><span th:text="#{sidebar.link.services.my}">My services</span></a>
                         </li>
                     </ul>
                     <!-- /.nav-second-level -->
                 </li>
-                <li>
-                    <a href="#"><i class="fa fa-edit fa-fw"></i> <span th:text="#{sidebar.link.bills}">Bills</span><span class="fa arrow"></span></a>
-                    <ul class="nav nav-second-level">
-                        <li>
-                            <a th:href="@{/bills}"><span th:text="#{sidebar.link.bills.all}">All bills</span></a>
-                        </li>
-                        <li>
-                            <a th:href="@{/bills/unpaid}"><span th:text="#{sidebar.link.bills.unpaid}">Unpaid bills</span></a>
-                        </li>
-                    </ul>
-                    <!-- /.nav-second-level -->
+                <li sec:authorize="hasRole('ADMIN')">
+                    <a th:href="@{/bills}"><i class="fa fa-edit fa-fw"></i> <span th:text="#{sidebar.link.bills}">Bills</span>
+                    </a>
                 </li>
-                <li>
-                    <a href="#"><i class="fa fa-files-o fa-fw"></i> Smth else...<span class="fa arrow"></span></a>
-                    <ul class="nav nav-second-level">
-                        <li>
-                            <a href="blank.html">Blank Page</a>
-                        </li>
-                        <li>
-                            <a href="@{/login}">Login Page</a>
-                        </li>
-                    </ul>
-                    <!-- /.nav-second-level -->
+                <li class="sidebar-search">
+                    <p style="color: gray;"><i th:text="#{sidebar.copyrights.title}">All rights reserved</i></p>
+                    <p style="color: gray; font-size: 0.9em;" th:text="#{sidebar.copyrights.date}">EPAM-SPB © 2018</p>
                 </li>
             </ul>
         </div>
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
index 4e103c8..ec7347f 100644
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@@ -1,7 +1,8 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:th="http://www.thymeleaf.org"
-      xmlns:layout="http://www.w3.org/1999/xhtml">
+      xmlns:layout="http://www.w3.org/1999/xhtml"
+      xmlns:sec="http://www.thymeleaf.org/thymeleaf-extras-springsecurity4">
 
 <head>
 
@@ -31,12 +32,25 @@
     <div id="page-wrapper">
         <div class="row">
             <div class="col-lg-12">
-                <h1 class="page-header" th:text="#{title.page.home}">Summary</h1>
+                <div style="overflow:hidden;" class="page-header" >
+                    <h1 sec:authorize="hasAnyRole('USER', 'SUBSCRIBER', 'ADMIN')"
+                        style="float:left; margin-top:0;" th:text="#{title.page.home}">Summary</h1>
+
+                    <h1 sec:authorize="hasRole('LOCKED')" th:text="#{title.page.home.locked}"></h1>
+                    <h1 sec:authorize="hasRole('DELETED')" th:text="#{title.page.home.deleted}"></h1>
+
+                    <span style="float: right;" sec:authorize="hasRole('ADMIN')">
+                        <form action="/" method="post">
+                            <button type="submit" th:text="#{title.page.check.button}"
+                                    class="btn btn-primary btn-lg">Check bills</button>
+                        </form>
+                    </span>
+                </div>
             </div>
             <!-- /.col-lg-12 -->
         </div>
         <!-- /.row -->
-        <div class="row">
+        <div class="row" sec:authorize="hasRole('ROLE_ADMIN')">
             <div class="col-lg-3 col-md-6">
                 <div class="panel panel-primary">
                     <div class="panel-heading">
@@ -45,14 +59,17 @@ <h1 class="page-header" th:text="#{title.page.home}">Summary</h1>
                                 <i class="fa fa-user fa-5x"></i>
                             </div>
                             <div class="col-xs-9 text-right">
-                                <div class="huge" th:text="${numberOfUsers}">17</div>
-                                <div>Subscribers</div>
+                                <div class="huge" th:text="${numberOfSubs}">17</div>
+                                <div th:text="#{container.word.subscribers}">Subscribers</div>
                             </div>
                         </div>
                     </div>
                     <a th:href="@{/users}">
                         <div class="panel-footer">
-                            <span class="pull-left">3 Unconfirmed</span>
+                            <span class="pull-left">
+                                <span th:text="${numberOfUsers}"></span>
+                                <span th:text="#{container.word.unconfirmed}">Unconfirmed</span>
+                            </span>
                             <span class="pull-right"><i class="fa fa-arrow-circle-right"></i></span>
                             <div class="clearfix"></div>
                         </div>
@@ -74,7 +91,7 @@ <h1 class="page-header" th:text="#{title.page.home}">Summary</h1>
                     </div>
                     <a th:href="@{/services}">
                         <div class="panel-footer">
-                            <span class="pull-left">View Details</span>
+                            <span class="pull-left" th:text="#{container.word.view-details}">View Details</span>
                             <span class="pull-right"><i class="fa fa-arrow-circle-right"></i></span>
                             <div class="clearfix"></div>
                         </div>
@@ -94,9 +111,9 @@ <h1 class="page-header" th:text="#{title.page.home}">Summary</h1>
                             </div>
                         </div>
                     </div>
-                    <a href="/bills">
+                    <a th:href="@{/bills}">
                         <div class="panel-footer">
-                            <span class="pull-left">View Details</span>
+                            <span class="pull-left" th:text="#{container.word.view-details}">View Details</span>
                             <span class="pull-right"><i class="fa fa-arrow-circle-right"></i></span>
                             <div class="clearfix"></div>
                         </div>
@@ -116,9 +133,9 @@ <h1 class="page-header" th:text="#{title.page.home}">Summary</h1>
                             </div>
                         </div>
                     </div>
-                    <a href="/bills">
+                    <a th:href="@{/bills}">
                         <div class="panel-footer">
-                            <span class="pull-left">View Details</span>
+                            <span class="pull-left" th:text="#{container.word.view-details}">View Details</span>
                             <span class="pull-right"><i class="fa fa-arrow-circle-right"></i></span>
                             <div class="clearfix"></div>
                         </div>
@@ -129,33 +146,24 @@ <h1 class="page-header" th:text="#{title.page.home}">Summary</h1>
         <!-- /.row -->
         <div class="row">
             <div class="col-lg-12">
-                <div class="panel panel-default">
+
+                <div class="well" th:if="${userRole} == 'ROLE_USER'">
+                    <h4 th:text="#{role.user.greeting}">Добро пожаловать!</h4>
+                    <p th:utext="#{role.user.text}"></p>
+                    <a class="btn btn-default btn-lg btn-block"
+                       th:text="#{role.user.refill}"
+                       th:href="@{/profile}">Перейти к пополнению счета</a>
+                </div>
+
+                <div class="panel panel-default" th:if="${userRole} != 'ROLE_DELETED'">
                     <div class="panel-heading">
                         <i class="fa fa-bar-chart-o fa-fw"></i>
                         <span th:text="#{app.project.title}">Project #7. Mobile Payment System.</span>
-                        <div class="pull-right">
-                            <div class="btn-group">
-                                <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown">
-                                    Actions
-                                    <span class="caret"></span>
-                                </button>
-                                <ul class="dropdown-menu pull-right" role="menu">
-                                    <li><a href="#">Action</a>
-                                    </li>
-                                    <li><a href="#">Another action</a>
-                                    </li>
-                                    <li><a href="#">Something else here</a>
-                                    </li>
-                                    <li class="divider"></li>
-                                    <li><a href="#">Separated link</a>
-                                    </li>
-                                </ul>
-                            </div>
-                        </div>
                     </div>
                     <!-- /.panel-heading -->
                     <div class="panel-body">
                         <p th:text="#{app.project.description}">The administrator connects subscribers. The subscriber can choose one or several of the provided services. The subscriber pays the bill for calls and services. The administrator can view the list of unpaid invoices and block the subscriber.</p>
+                        <p><img src="http://www.beliefmedia.com/wp-content/uploads/2017/06/telephone-wp-shortcode-1000x200.jpg" class="img-responsive"></p>
                     </div>
                     <!-- /.panel-body -->
                 </div>
diff --git a/src/main/resources/templates/service/all.html b/src/main/resources/templates/service/all.html
deleted file mode 100644
index 66ca713..0000000
--- a/src/main/resources/templates/service/all.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org" xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-    <meta charset="UTF-8">
-    <title>Service management</title>
-</head>
-<body>
-<!--/*@thymesVar id="serviceunit" type="com.epam.lab.mobilepaymentsystem.model.ServiceUnit"*/-->
-<form action="#" th:action="@{/service/all}" th:object="${services}" method="get">
-    <div>
-        <h2>Service list</h2>
-        <table>
-            <tr>
-                <th>Name</th>
-                <th>Cost</th>
-                <!--<th>Is connected?</th>-->
-            </tr>
-            <tr th:each="service : ${services}">
-                <td th:text="${service.name}"></td>
-                <td th:text="${service.cost}"></td>
-                <!--<td><input type="checkbox" th:checked="${service.getValue()}"/></td>-->
-            </tr>
-        </table>
-    </div>
-</form>
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/service/my.html b/src/main/resources/templates/service/my.html
deleted file mode 100644
index 4e2f578..0000000
--- a/src/main/resources/templates/service/my.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org" xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-    <meta charset="UTF-8">
-    <title>My services</title>
-</head>
-<body>
-    <div>
-        <h2>My service list</h2>
-        <table>
-            <tr>
-                <th>Name</th>
-                <th>Cost</th>
-                <th></th>
-            </tr>
-            <tr th:each="service : ${activeServices}">
-                <form action="#" th:action="@{/service/my}" th:object="${selectedService}" method="post">
-                <td th:text="${service.name}"></td>
-                <td th:text="${service.cost}"></td>
-                <td>
-                    <input type="hidden" th:field="*{{id}}" th:value="${service.id}"/>
-                    <input type="submit" value="Unsub" title="Unsubscribe">
-                </td>
-                </form>
-            </tr>
-        </table>
-    </div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/service/new.html b/src/main/resources/templates/service/new.html
deleted file mode 100644
index 3ff01f1..0000000
--- a/src/main/resources/templates/service/new.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org" xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-    <meta charset="UTF-8">
-    <title>Service management</title>
-</head>
-<body>
-<form action="#" th:action="@{/service/new}" th:object="${selectedService}" method="post">
-    <div>
-        <select th:field="*{id}" id="subscribeToService" title="Select service to subscribe">
-            <option value="-1">Select new service to subscribe</option>
-            <option th:each="serviceUnit : ${inactiveServices}"
-                    th:value="${serviceUnit.id}"
-                    th:text="${serviceUnit.name}+' - '+${serviceUnit.cost}"
-            ></option>
-        </select>
-        <input type="submit" name="Subscribe" title="Subscribe">
-    </div>
-    <!--<tr th:each="instance : ${analysis.instanceMap}">-->
-        <!--<td th:text="${instance.key}">keyvalue</td>-->
-        <!--<td th:text="${instance.value.numOfData}">num</td>-->
-</form>
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/service/service_add.html b/src/main/resources/templates/service/service_add.html
index 340dfe3..02cbb68 100644
--- a/src/main/resources/templates/service/service_add.html
+++ b/src/main/resources/templates/service/service_add.html
@@ -76,6 +76,15 @@ <h1 class="page-header" th:text="#{title.page.services.add}">Add new item.</h1>
                                     <input type="number" class="form-control"
                                            th:field="*{cost}"  th:placeholder="#{service.form.add.cost}"/>
                                 </div>
+                                <p th:if="${#fields.hasErrors('cost')}" th:errors="*{cost}"></p>
+                            </div>
+
+                            <div class="form-group">
+                                <div class="input-group">
+                                    <span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span></span>
+                                    <input type="number" class="form-control"
+                                           th:field="*{duration}" th:placeholder="#{service.form.add.duration}"/>
+                                </div>
                             </div>
 
                             <input class="btn btn-sm btn-primary btn-block"
diff --git a/src/main/resources/templates/service/service_item.html b/src/main/resources/templates/service/service_item.html
index 6c4a59d..4c887be 100644
--- a/src/main/resources/templates/service/service_item.html
+++ b/src/main/resources/templates/service/service_item.html
@@ -51,27 +51,26 @@ <h1 class="page-header" th:text="${service.name}">Service unit.</h1>
         <div class="well">
             <table border="0" width="100%" class="service-info">
                 <tr>
-                    <td><strong>Название</strong></td>
+                    <td><strong th:text="#{services.item.name}">Название</strong></td>
                     <td th:text="${service.name}"></td>
                 </tr>
                 <tr>
-                    <td><strong>Описание</strong></td>
+                    <td><strong th:text="#{services.item.description}">Описание</strong></td>
                     <td th:text="${service.description}"></td>
                 </tr>
                 <tr>
-                    <td><strong>Стоимость</strong></td>
+                    <td><strong th:text="#{services.item.cost}">Стоимость</strong></td>
                     <td th:text="${service.cost}"></td>
                 </tr>
+                <tr>
+                    <td><strong th:text="#{services.item.duration}">Длительность</strong></td>
+                    <td th:text="${service.duration}"></td>
+                </tr>
             </table>
 
 
-            <!--<ul>-->
-                <!--<li><strong>Название:</strong> <span th:text="${service.name}"></span> </li>-->
-                <!--<li><strong>Описание:</strong> <span th:text="${service.description}"></span> </li>-->
-                <!--<li><strong>Стоимость:</strong> <span th:text="${service.cost}"></span> </li>-->
-            <!--</ul>-->
 
-            <a class="btn btn-default btn-lg btn-block" th:href="@{/services}">
+            <a class="btn btn-default btn-lg btn-block" th:href="@{/services}" th:text="#{services.item.backtolist}">
                 Вернуться к списку услуг.</a>
 
         </div>
diff --git a/src/main/resources/templates/service/service_list.html b/src/main/resources/templates/service/service_list.html
index db8fc5b..3b127ba 100644
--- a/src/main/resources/templates/service/service_list.html
+++ b/src/main/resources/templates/service/service_list.html
@@ -1,7 +1,8 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:th="http://www.thymeleaf.org"
-      xmlns:layout="http://www.w3.org/1999/xhtml">
+      xmlns:layout="http://www.w3.org/1999/xhtml"
+      xmlns:sec="http://www.thymeleaf.org/thymeleaf-extras-springsecurity4">
 
 <head>
 
@@ -11,7 +12,7 @@
     <meta name="description" content="">
     <meta name="author" content="EPAM lab">
 
-    <title th:text="#{title.page.users}"> User list</title>
+    <title th:text="#{title.page.services}"> Service list</title>
 
     <div th:replace="fragments/header :: header-css"></div>
 
@@ -31,7 +32,20 @@
     <div id="page-wrapper">
         <div class="row">
             <div class="col-lg-12">
-                <h1 class="page-header" th:text="#{title.page.services}">Service list.</h1>
+                <div style="overflow:hidden;" class="page-header" >
+                    <h1 style="float:left; margin-top:0;" th:text="#{title.page.services}">Service list.</h1>
+
+                    <h1 sec:authorize="hasRole('LOCKED')" th:text="#{title.page.home.locked}"></h1>
+                    <h1 sec:authorize="hasRole('DELETED')" th:text="#{title.page.home.deleted}"></h1>
+
+                    <span style="float: right;" sec:authorize="hasRole('ADMIN')">
+                        <a th:href="@{/services/add}" class="btn btn-primary">
+                            <i class="fa fa-fw -square -circle fa-plus-square"></i>
+                            <span th:text="#{service.form.button.submit}">Add new</span>
+                        </a>
+                    </span>
+                </div>
+
             </div>
             <!-- /.col-lg-12 -->
         </div>
@@ -53,29 +67,25 @@ <h1 class="page-header" th:text="#{title.page.services}">Service list.</h1>
             }
         </style>
 
-        <div class="well">
-            <h4>Краткая информация</h4>
-            <ul>
-                <li>Ниже вы можете ознакомиться со списком предоставляемых услуг.</li>
-                <li>Для того, чтобы добавить нужную услугу, выберете ее название в поле ниже и нажмите кнопку "Добавить".</li>
-                <li>После этого будет сформирован соответствующий счет, который нужно будет оплатить в ближайшее время.</li>
-                <li>Все услуги имеют свою продолжительность, будьте внимательны.</li>
-            </ul>
+        <div class="well" th:if="${userRole != 'ROLE_USER'}">
+            <h4 th:text="#{services.new.brief}">Краткая информация</h4>
+            <ul th:utext="#{services.new.points}"></ul>
 
 
-            <!--TODO: add duration field-->
             <form action="#" th:action="@{/services}" th:object="${selectedService}" method="post">
                 <div>
                     <div class="input-group mb-3">
                         <select th:field="*{id}" id="subscribeToService" class="form-control" title="Select service to subscribe">
-                            <option value="-1">Select new service to subscribe</option>
+                            <option value="-1" th:text="#{services.new.select-text}"></option>
                             <option th:each="serviceUnit : ${inactiveServices}"
                                     th:value="${serviceUnit.id}"
-                                    th:text="${serviceUnit.name}+' - '+${serviceUnit.cost}"
+                                    th:text="${serviceUnit.name}+' - '+${serviceUnit.cost}+'$ - '
+                                    +${serviceUnit.duration}+'d'"
                             ></option>
                         </select>
                         <div class="input-group-append">
-                            <button class="btn btn-primary" style="margin-left:1em;" type="submit">Subscribe</button>
+                            <button class="btn btn-primary" style="margin-left:1em;"
+                                    type="submit" th:text="#{services.new.subscribe}">Subscribe</button>
                         </div>
                     </div>
 
@@ -89,8 +99,7 @@ <h4>Краткая информация</h4>
 
 
                 <div class="panel panel-default">
-                    <div class="panel-heading">
-                        Service list
+                    <div class="panel-heading" th:text="#{title.page.services}">
                     </div>
                     <!-- /.panel-heading -->
                     <div class="panel-body">
@@ -165,22 +174,12 @@ <h4>Краткая информация</h4>
                         <ul class="services-list" th:each="service : ${services}">
                             <li>
                                 <div class="services-list-items">
-                                    <a th:href="@{'/services/' + ${service.id}}" th:text="${service.name}"></a>
+                                    <a th:href="@{'/services/' + ${service.id}}"
+                                       th:text="${service.name + ' - ' + service.duration + 'd.'}"></a>
                                     <span th:text="${service.cost} + ' $'"></span>
                                 </div>
                             </li>
                         </ul>
-
-
-
-                        <div class="panel">
-                            <div class="col-md-12 well">
-                                <a th:href="@{/services/add}" class="btn btn-primary">
-                                    <i class="fa fa-fw -square -circle fa-plus-square"></i>
-                                    <span th:text="#{service.form.button.submit}">Add new</span>
-                                </a>
-                            </div>
-                        </div>
                         <!-- /.row -->
 
 
diff --git a/src/main/resources/templates/service/service_of_user.html b/src/main/resources/templates/service/service_of_user.html
deleted file mode 100644
index 566549b..0000000
--- a/src/main/resources/templates/service/service_of_user.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Title</title>
-</head>
-<body>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/service/service_user_list.html b/src/main/resources/templates/service/service_user_list.html
new file mode 100644
index 0000000..1ed9efe
--- /dev/null
+++ b/src/main/resources/templates/service/service_user_list.html
@@ -0,0 +1,150 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:th="http://www.thymeleaf.org"
+      xmlns:layout="http://www.w3.org/1999/xhtml">
+
+<head>
+
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta name="description" content="">
+    <meta name="author" content="EPAM lab">
+
+    <title th:text="#{title.page.services}"> Service list</title>
+
+    <div th:replace="fragments/header :: header-css"></div>
+
+</head>
+
+<body>
+
+<div id="wrapper">
+
+    <!-- Navigation -->
+    <nav class="navbar navbar-default navbar-static-top" role="navigation" style="margin-bottom: 0">
+        <div th:replace="fragments/header :: header"></div>
+
+        <div th:replace="fragments/sidebar :: sidebar"></div>
+    </nav>
+
+    <div id="page-wrapper">
+        <div class="row">
+            <div class="col-lg-12">
+                <h1 class="page-header" th:text="#{title.page.services}">Service list.</h1>
+            </div>
+            <!-- /.col-lg-12 -->
+        </div>
+        <!-- /.row -->
+
+
+        <div class="row">
+            <div class="col-lg-12">
+                <div class="panel panel-default">
+                    <div class="panel-heading" th:text="#{title.page.services}"></div>
+                    <!-- /.panel-heading -->
+                    <div class="panel-body">
+                        <div class="table-responsive">
+                            <table class="table table-striped table-bordered table-hover">
+                                <thead>
+                                <tr>
+                                    <th th:text="#{bills.table.th.service}">Name</th>
+                                    <th th:text="#{bills.table.th.cost}">Cost</th>
+                                    <th th:text="#{bills.table.th.start-date}">Start date</th>
+                                    <th th:text="#{bills.table.th.end-date}">End date</th>
+                                    <th th:text="#{bills.table.th.owner}">Owner</th>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                <tr th:each="bill : ${userBills}" th:if="${empty == false}">
+                                    <td th:if="${currentUserId == bill.user.id}">
+                                        <a th:href="@{'/profile/bills/{bid}' (bid=${bill.id})}"
+                                           th:text="${bill.serviceUnit.name}"></a>
+                                    </td>
+                                    <td th:unless="${currentUserId == bill.user.id}">
+                                        <a th:href="@{'/users/{uid}/bills/{bid}' (uid=${bill.user.id}, bid=${bill.id})}"
+                                           th:text="${bill.serviceUnit.name}"></a>
+                                    </td>
+                                    <td th:text="${bill.actualCost}"></td>
+                                    <td th:text="${#dates.format(bill.startDate, 'dd:MM:yyyy')}"></td>
+                                    <td th:text="${#dates.format(bill.endDate, 'dd:MM:yyyy')}"></td>
+                                    <td th:if="${currentUserId == bill.user.id}">
+                                        <a th:href="@{/profile}" th:text="${bill.user.username}"></a>
+                                    </td>
+                                    <td th:unless="${currentUserId == bill.user.id}">
+                                        <a th:href="@{'/users/' + ${bill.user.id}}" th:text="${bill.user.username}"></a>
+                                    </td>
+                                </tr>
+                                <tr th:unless="${empty == false}"><td colspan="5" th:text="#{global.isEmpty}"></td></tr>
+                                </tbody>
+                            </table>
+                        </div>
+                        <!-- /.table-responsive -->
+                    </div>
+                    <!-- /.panel-body -->
+                </div>
+                <!-- /.panel -->
+            </div>
+            <!-- /.col-lg-12 -->
+
+
+            <div class="col-lg-12">
+                <div class="panel panel-default">
+                    <div class="panel-heading" th:text="#{services.old}"></div>
+                    <!-- /.panel-heading -->
+                    <div class="panel-body">
+                        <div class="table-responsive">
+                            <table class="table table-striped table-bordered table-hover">
+                                <thead>
+                                <tr>
+                                    <th th:text="#{bills.table.th.service}">Name</th>
+                                    <th th:text="#{bills.table.th.cost}">Cost</th>
+                                    <th th:text="#{bills.table.th.start-date}">Start date</th>
+                                    <th th:text="#{bills.table.th.end-date}">End date</th>
+                                    <th th:text="#{bills.table.th.owner}">Owner</th>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                <tr th:each="bill : ${oldUserServices}" th:if="${empty2 == false}">
+                                    <td th:if="${currentUserId == bill.user.id}">
+                                        <a th:href="@{'/profile/bills/{bid}' (bid=${bill.id})}"
+                                           th:text="${bill.serviceUnit.name}"></a>
+                                    </td>
+                                    <td th:unless="${currentUserId == bill.user.id}">
+                                        <a th:href="@{'/users/{uid}/bills/{bid}' (uid=${bill.user.id}, bid=${bill.id})}"
+                                           th:text="${bill.serviceUnit.name}"></a>
+                                    </td>
+                                    <td th:text="${bill.actualCost}"></td>
+                                    <td th:text="${#dates.format(bill.startDate, 'dd:MM:yyyy')}"></td>
+                                    <td th:text="${#dates.format(bill.endDate, 'dd:MM:yyyy')}"></td>
+                                    <td th:if="${currentUserId == bill.user.id}">
+                                        <a th:href="@{/profile}" th:text="${bill.user.username}"></a>
+                                    </td>
+                                    <td th:unless="${currentUserId == bill.user.id}">
+                                        <a th:href="@{'/users/' + ${bill.user.id}}" th:text="${bill.user.username}"></a>
+                                    </td>
+                                </tr>
+                                <tr th:unless="${empty2 == false}"><td colspan="5" th:text="#{global.isEmpty}"></td></tr>
+                                </tbody>
+                            </table>
+                        </div>
+                        <!-- /.table-responsive -->
+                    </div>
+                    <!-- /.panel-body -->
+                </div>
+                <!-- /.panel -->
+            </div>
+            <!-- /.col-lg-12 -->
+        </div>
+        <!-- /.row -->
+    </div>
+    <!-- /#page-wrapper -->
+
+</div>
+<!-- /#wrapper -->
+
+<div th:replace="fragments/footer :: footer"></div>
+
+</body>
+
+</html>
diff --git a/src/main/resources/templates/serviceunit.html b/src/main/resources/templates/serviceunit.html
deleted file mode 100644
index ba8f3d8..0000000
--- a/src/main/resources/templates/serviceunit.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org">
-
-<head>
-    <meta charset="UTF-8">
-    <title th:text="#{service_adding}"></title>
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
-    <script type="text/javascript">
-        $(document).ready(function() {
-            $("#locales").change(function () {
-                var selectedOption = $('#locales').val();
-                if (selectedOption !== ''){
-                    window.location.replace('/service/add?lang=' + selectedOption);
-                }
-            });
-        });
-    </script>
-</head>
-<body>
-
-    <h3 th:text="#{service_list}"></h3>
-
-     <form action="#" th:action="@{/service/add}" th:object="${service}" method="post">
-         <p th:text="#{service_name}"/> <input type="text" th:field="*{name}" title="Enter the service name"/>
-         <p th:if="${#fields.hasGlobalErrors()}" th:text="${sameName}"></p>
-         <p th:if="${#fields.hasErrors('name')}" th:errors="*{name}"></p>
-         <p th:text="#{service_cost}"/> <input type="text" th:field="*{cost}" title="Enter the service cost"/>
-         <p><input type="submit" th:value="#{submit}"/></p>
-    </form>
-
-
-    <table border="1">
-        <tr>
-            <th>ID</th>
-            <th th:text="#{name}"></th>
-            <th th:text="#{cost}"></th>
-        </tr>
-
-        <tr th:each="service : ${serviceList}">
-            <td th:utext="${service.id}"></td>
-            <td th:utext="${service.name}"></td>
-            <td th:utext="${service.cost}"></td>
-        </tr>
-    </table>
-
-    <span th:text="#{lang.change}"></span>
-    <select id="locales">
-        <option value=""></option>
-        <option value="en" th:text="#{lang.english}"></option>
-        <option value="de" th:text="#{lang.russian}"></option>
-    </select>
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/user/registration.html b/src/main/resources/templates/user/registration.html
index 3490296..5649d74 100644
--- a/src/main/resources/templates/user/registration.html
+++ b/src/main/resources/templates/user/registration.html
@@ -113,10 +113,10 @@ <h1>Sign up now</h1>
             <p>Fill in the form below to get instant access.</p><br>
             <form th:action="@{/registration}" th:object="${userForm}" method="POST" enctype="utf8" role="form">
                 <input th:field="*{username}" type="text" name="username" placeholder="Username">
-                <p th:if="${#fields.hasGlobalErrors()}" th:text="${userWithSameUserName}"></p>
-                <p th:if="${#fields.hasErrors('username')}" th:errors="*{username}"></p>
+                <div th:if="${#fields.hasGlobalErrors()}" th:text="${userWithSameUserName}" class="alert alert-danger"></div>
+                <div th:if="${#fields.hasErrors('username')}" th:errors="*{username}" class="alert alert-danger"></div>
                 <input th:field="*{fullname}" type="text" name="fullname" placeholder="Fullname">
-                <p th:if="${#fields.hasErrors('fullname')}" th:errors="*{fullname}"></p>
+                <div th:if="${#fields.hasErrors('fullname')}" th:errors="*{fullname}" class="alert alert-danger"></div>
                 <!--<select>-->
                     <!--<option th:each="role : ${T(com.epam.lab.mobilepaymentsystem.model.Role).values()}"-->
                             <!--th:value="${role.getDisplayName()}"-->
@@ -124,9 +124,9 @@ <h1>Sign up now</h1>
                     <!--</option>-->
                 <!--</select>-->
                 <input th:field="*{password}" type="password" name="password" placeholder="Password">
-                <p th:if="${#fields.hasErrors('password')}" th:errors="*{password}"></p>
+                <div th:if="${#fields.hasErrors('password')}" th:errors="*{password}" class="alert alert-danger"></div>
                 <input th:field="*{confirmPassword}" type="password" name="confirmPassword" placeholder="Confirm password">
-                <p th:if="${#fields.hasGlobalErrors()}" th:text="${passwordsNotSame}"></p>
+                <div th:if="${#fields.hasGlobalErrors()}" th:text="${passwordsNotSame}" class="alert alert-danger"></div>
                 <input type="submit" name="register" class="login loginmodal-submit" value="Sign me up!">
             </form>
 
diff --git a/src/main/resources/templates/user/user_item.html b/src/main/resources/templates/user/user_item.html
index d499d37..005bc9c 100644
--- a/src/main/resources/templates/user/user_item.html
+++ b/src/main/resources/templates/user/user_item.html
@@ -11,7 +11,7 @@
     <meta name="description" content="">
     <meta name="author" content="EPAM lab">
 
-    <title th:text="#{title.page.users}"> User list</title>
+    <title th:text="#{title.page.user-item}"> User list</title>
 
     <div th:replace="fragments/header :: header-css"></div>
 
@@ -48,26 +48,43 @@ <h1 class="page-header" th:text="#{title.page.user-item}">User profile.</h1>
                             <div class="span8">
                                 <h3 th:text="${user.fullname}"> fullname</h3>
                                 <h6 th:text="${user.username}"> login</h6>
-                                <h6><strong>Bank book:</strong> <span th:text="${user.bankAccount}"> 0</span> $</h6>
-                                <h6><strong>Group:</strong> <span th:text="${user.role}"> subscriber</span></h6>
+                                <h6><strong th:text="#{users.list.table.bankbook}">Bank book:</strong>
+                                    <span th:text="${user.bankAccount}"> 0</span> $</h6>
+                                <h6><strong th:text="#{users.list.table.group}">Group:</strong>
+                                    <span th:text="${user.role}"> subscriber</span></h6>
                             </div>
 
-                            <form role="form" method="post" th:object="${howMuchToIncrease}"
-                                  th:action="@{'/users/{id}/refill' (id=${user.id})}">
+                            <style>
+                                .input-group {
+                                    float: left;
+                                }
+                                .input-group-append {
+                                    display: flex;
+                                }
+                            </style>
+
+                            <form role="form" method="post" th:if="${user.id == currentUserId}"
+                                  data-th-object="${howMuchToIncrease}"
+                                  data-th-action="@{/profile}" id="refill-form">
                                 <div>
                                     <div class="input-group mb-3">
                                         <div class="input-group">
                                             <span class="input-group-addon"><span class="glyphicon glyphicon-usd"></span></span>
-                                            <input type="number" class="form-control" th:field="*{tranche}"/>
+                                            <input type="number" class="form-control" name="tranche" id="tranche"
+                                                   placeholder="Введите число от 50 до 1000"
+                                                   data-th-field="${howMuchToIncrease.tranche}"/>
+                                            <!--<div th:if="${error}" th:text="${error}"></div>-->
                                         </div>
                                         <div class="input-group-append">
-                                            <button class="btn btn-primary" style="margin-left:1em;" type="submit">Пополнить</button>
+                                            <button class="btn btn-primary" style="margin-left:1em;"
+                                                    type="submit" th:text="#{users.item.refill}">Пополнить</button>
                                         </div>
                                     </div>
-
                                 </div>
                             </form>
 
+                            <div class="alert alert-danger" style="float: left; margin-top: 1em;"
+                                 data-th-if="${error == true}" th:text="#{error.tranche}"></div>
 
                         </div>
                         <div class="col-lg-3 col-md-6">
@@ -78,14 +95,21 @@ <h6><strong>Group:</strong> <span th:text="${user.role}"> subscriber</span></h6>
                                             <i class="fa fa-exchange fa-5x"></i>
                                         </div>
                                         <div class="col-xs-9 text-right">
-                                            <div class="huge">4</div>
-                                            <div>Services</div>
+                                            <div class="huge" th:text="${numberOfServices}"></div>
+                                            <div th:text="#{sidebar.link.services}">Services</div>
                                         </div>
                                     </div>
                                 </div>
-                                <a th:href="@{${user.id} + '/services'}">
+                                <a th:if="${myProfile == true}" th:href="@{'/profile/services'}">
+                                    <div class="panel-footer">
+                                        <span class="pull-left" th:text="#{container.word.view-details}">View Details</span>
+                                        <span class="pull-right"><i class="fa fa-arrow-circle-right"></i></span>
+                                        <div class="clearfix"></div>
+                                    </div>
+                                </a>
+                                <a th:unless="${myProfile == true}" th:href="@{'/users/'+${user.id}+'/services'}">
                                     <div class="panel-footer">
-                                        <span class="pull-left">View Details</span>
+                                        <span class="pull-left" th:text="#{container.word.view-details}">View Details</span>
                                         <span class="pull-right"><i class="fa fa-arrow-circle-right"></i></span>
                                         <div class="clearfix"></div>
                                     </div>
@@ -100,14 +124,21 @@ <h6><strong>Group:</strong> <span th:text="${user.role}"> subscriber</span></h6>
                                             <i class="fa fa-credit-card fa-5x"></i>
                                         </div>
                                         <div class="col-xs-9 text-right">
-                                            <div class="huge">2</div>
-                                            <div>Unpaid bills</div>
+                                            <div class="huge" th:text="${numberOfBills}">2</div>
+                                            <div th:text="#{sidebar.link.bills}">Unpaid bills</div>
                                         </div>
                                     </div>
                                 </div>
-                                <a th:href="@{${user.id}+'/bills'}">
+                                <a th:if="${myProfile == true}" th:href="@{'/profile/bills'}">
+                                    <div class="panel-footer">
+                                        <span class="pull-left" th:text="#{container.word.view-details}">View Details</span>
+                                        <span class="pull-right"><i class="fa fa-arrow-circle-right"></i></span>
+                                        <div class="clearfix"></div>
+                                    </div>
+                                </a>
+                                <a th:unless="${myProfile == true}" th:href="@{'/users/'+${user.id}+'/bills'}">
                                     <div class="panel-footer">
-                                        <span class="pull-left">View Details</span>
+                                        <span class="pull-left" th:text="#{container.word.view-details}">View Details</span>
                                         <span class="pull-right"><i class="fa fa-arrow-circle-right"></i></span>
                                         <div class="clearfix"></div>
                                     </div>
diff --git a/src/main/resources/templates/user/user_list.html b/src/main/resources/templates/user/user_list.html
index 346cfe6..26cbfc9 100644
--- a/src/main/resources/templates/user/user_list.html
+++ b/src/main/resources/templates/user/user_list.html
@@ -37,38 +37,6 @@ <h1 class="page-header" th:text="#{title.page.users}">User list.</h1>
         </div>
         <!-- /.row -->
 
-
-        <!--<div class="panel">-->
-            <!--<div class="col-md-12 well">-->
-                <!--<a class="btn btn-primary" data-toggle="modal" data-target="#usuario"><i class="fa fa-fw -square -circle fa-plus-square"></i> Some action</a>-->
-            <!--</div>-->
-        <!--</div>-->
-         <!--/.row -->
-
-        <div class="modal fade" id="confirm-delete" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-            <div class="modal-dialog">
-                <div class="modal-content">
-
-                    <div class="modal-header">
-                        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-                        <h4 class="modal-title" id="myModalLabel">Confirm Delete</h4>
-                    </div>
-
-                    <div class="modal-body">
-                        <p>You are about to delete this user, this procedure is irreversible.</p>
-                        <p>Do you want to proceed?</p>
-                        <p class="debug-url"></p>
-                    </div>
-
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-                        <a class="btn btn-danger btn-ok">Delete</a>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-
         <div class="row">
             <div class="col-lg-12">
 
@@ -77,20 +45,18 @@ <h4 class="modal-title" id="myModalLabel">Confirm Delete</h4>
                     table.table-striped .btn {padding: 0 6px;}
                 </style>
                 <div class="panel panel-default">
-                    <div class="panel-heading">
-                        DataTables Advanced Tables
-                    </div>
+                    <div class="panel-heading" th:text="#{users.list.title}"></div>
                     <!-- /.panel-heading -->
                     <div class="panel-body">
                         <table width="100%" class="table table-striped table-bordered table-hover" id="dataTables-example">
                             <thead>
                             <tr>
                                 <th>ID</th>
-                                <th>Fullname</th>
-                                <th>Username</th>
-                                <th>Bank book</th>
-                                <th>Group</th>
-                                <th>Actions</th>
+                                <th th:text="#{users.list.table.fullname}">Fullname</th>
+                                <th th:text="#{users.list.table.username}">Username</th>
+                                <th th:text="#{users.list.table.bankbook}">Bank book</th>
+                                <th th:text="#{users.list.table.group}">Group</th>
+                                <th th:text="#{users.list.table.actions}">Actions</th>
                             </tr>
                             </thead>
                             <tbody>
@@ -101,32 +67,36 @@ <h4 class="modal-title" id="myModalLabel">Confirm Delete</h4>
                                 <td th:utext="${user.bankAccount}" style="padding-left: 1.5em"></td>
                                 <td class="center" th:utext="${user.role}">Subscriber</td>
                                 <td class="center">
-                                    <div class="btn-group">
-                                        <!--<button class="btn btn-default" value="left"-->
-                                                <!--type="button" th:action="@{'/users/{id}/delete'(id=${user.id})}">-->
-                                            <!--<i class="fa fa-fw s fa-remove"></i>Remove</button>-->
-
-                                        <!--<a href="#" data-href="delete.php?id=23" data-toggle="modal" data-target="#confirm-delete">Delete record #23</a>-->
-
-                                        <button class="btn btn-default" value="left" type="button"
-                                                th:onclick="@{'/users/{id}/delete'(id=${user.id})}" data-toggle="modal" data-target="#confirm-delete">
-                                            <i class="fa fa-fw s fa-remove"></i>Remove
-                                        </button>
-
-
-                                        <button class="btn btn-default" value="right" type="button">
-                                            <i class="fa fa-fw fa-cog"></i>Edit</button>
+                                    <div class="btn-group" style="width: 18em;">
+                                        <form th:action="@{'/users/{id}/delete'(id=${user.id})}"
+                                              method="post" style="float:left;">
+                                            <button class="btn btn-default" value="left" type="submit">
+                                                <i class="fa fa-fw s fa-remove"></i>
+                                                <span th:text="#{users.list.table.button.delete}"></span>
+                                            </button>
+                                        </form>
+
+                                        <form th:action="@{'/users/{id}/block'(id=${user.id})}" method="post"
+                                              th:if="${!userService.getUserById(user.id).getRole().equals('ROLE_LOCKED')}">
+                                            <button class="btn btn-default" value="right" type="submit">
+                                                <i class="fa fa-fw fa-ban"></i>
+                                                <span th:text="#{users.list.table.button.block}"></span>
+                                            </button>
+                                        </form>
+
+                                        <form th:action="@{'/users/{id}/unblock'(id=${user.id})}" method="post"
+                                              th:if="${userService.getUserById(user.id).getRole().equals('ROLE_LOCKED')}">
+                                            <button class="btn btn-default" value="right" type="submit">
+                                                <i class="fa fa-fw fa-ban"></i>
+                                                <span th:text="#{users.list.table.button.unblock}"></span>
+                                            </button>
+                                        </form>
                                     </div>
                                 </td>
                             </tr>
                             </tbody>
                         </table>
                         <!-- /.table-responsive -->
-                        <div class="well">
-                            <h4>DataTables Usage Information</h4>
-                            <p>DataTables is a very flexible, advanced tables plugin for jQuery. In SB Admin, we are using a specialized version of DataTables built for Bootstrap 3. We have also customized the table headings to use Font Awesome icons in place of images. For complete documentation on DataTables, visit their website at <a target="_blank" href="https://datatables.net/">https://datatables.net/</a>.</p>
-                            <a class="btn btn-default btn-lg btn-block" target="_blank" href="https://datatables.net/">View DataTables Documentation</a>
-                        </div>
                     </div>
                     <!-- /.panel-body -->
                 </div>
diff --git a/src/test/java/com/epam/lab/mobilepaymentsystem/ServiceTests.java b/src/test/java/com/epam/lab/mobilepaymentsystem/ServiceTests.java
index bad69ab..70cc2f9 100644
--- a/src/test/java/com/epam/lab/mobilepaymentsystem/ServiceTests.java
+++ b/src/test/java/com/epam/lab/mobilepaymentsystem/ServiceTests.java
@@ -41,7 +41,7 @@ public void addService() {
     // todo: for some reason it fails
     @Test
     public void numberOfServices() {
-        assertEquals(count, serviceUnitService.numberOfServices());
+        assertEquals(count, serviceUnitService.numberOfAllService());
     }
 
     @Test