Visual improvements + added pluso buttons