Made a kind of new layout and added support for tags