code optimizations

new design for loading data, ui changes