Better user interface (tested on FireFox / Chrome , Windows / Linux)