Added @ManagedProperty and improved formatting of tables