Close button on toolbar, small adjustments, deleting old code,