Some UI tweaks. Beginning of edit functionality