bug fixing and styling