Removed unused errors, Code Refactoring

- Layout alignment with beaker cells issue fixed