bug + css fixes