Minifying code & improving view