Fixed bug + pictures