modified files so that the app works again with tab stuff