Fixes. Mainscreen still a little bit defect