new layout and features and many fixes