Added Layout and several View improvements.