added Page Size options and bugfix