Look-and-feel improvements, CSS refactor