Prepare fixes, styles changes