Styles

merge issues resolved...