Multiple bugfixing and updaed some styles