Made some visual changes and a bugfix