Icons added & Database layout preview