remove widget from widget map
make class final
fix layout area