Add new layout, new features and a lot of fix for bugs