fix highlighting of current page on Tests screen
align buttons horizontally on test and batch screen
Fix failing tests