UI tweaks
Merge branch 'master' of github.com:luckyx1/NACLA_2.0
Merge branch 'master' of github.com:luckyx1/NACLA_2.0
fixing test
Merge branch 'master' of github.com:luckyx1/NACLA_2.0