Styling changes, finalizing build components