changed header
made some performance improvements, changed the layout a bit