Changed validation algorithm, added widgets layout, little things