Fixed more button width and bug with context being saved as keyword on update