Layout fix, some style changes