Design changes, bugs was fixed