Some styles improved to fit with website layout