Minor features update
Minor styling changes