Layer Config improvements; add/del logic and layout