Layout updated, bugs fixed