Changes before browser testing

- Changes as requested before browser testing.

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