Pre final

need some css fixes