Added modern some (currently ugly) ui styling and a bug ... to be fixed