Changes

mostly cosmetics and layout
Layout Changes and Other Modification

other bug fixes and layout changes