Pratik's changes to header and updates to BPTheme layout