Improved cucumber test

Also fixed some page layout