Updated features and fixed some styles