Layout Change & LOTS of updates!!!!