Added windows, menus and a few others things