some tweaks, starting to work on edit screens