Fixed layout, added info