Added support to store previous header values
Improved layout and organized views by hierarchy