lots of updates, edit and cat window layout