Prettify some layouts
Temporary disable of master key id extraction from uri
Prettify more layouts, fix edit and encrypt intents from key view