Adding correct button classes. Some tables fixes