fixed some layout and fb plugin issues