Merging flackstyling into master

added modal stuff ya diiiiig