PR - Fixes F - Header Buttons

Fix #6