Bettering the presentation a bit. Still buggy though