final styling integration and fixes