Update layout
Rework of JsonParser for alerts