Improving options page and other few small changes