Improve layers widgets