Before browser check

Final changes before browser testing.

Signed-off-by: Spyros Lefkaditis <slefkaditis@gmail.com>