formatting, add modal, change navbar