massive lay outing changes - looks not so big :)