[FIP & FEATURES] : Corrected various layout issues with FIP and Features