Finished filter box fixes

Trying to merge this thing i have no idea what im doing oh god